The latest update is that we have cut that last drink of water before bed and we now wake him before we go to bed to go to the toilet.
He still wets through about 30% of the time, but it's usually only a little bit, so it doesn't wake him. He wakes at 7am and the top of his shorts are a little wet.