Just wanted to say thank you - about a week of the wake to sleep (which he was sometimes awake for anyway) plus some reassurance techniques, and then he had dropped that last wake up.
So it ended up being a combo of wake to sleep, a bit of resettling, and also just him getting used to it.
Thanks a lot for your support and advice.