Yep, I'll use the available tools now I know of this setup, thanks! I just wasn't paying attention at booking, assuming nothing has changed.
And yes, I was aiming to be a bit earlier - I like to make sure I make the WC train as otherwise things get flakey, even if nominally that's the railways...