Have you tried giving him more food before bed?

Or maybe stop the bottle and give him a sippy cup or normal cup instead? That way he can have a drink quite quickly instead of being awake and drinking for a long time?

I know that I tried both of these things with DD and they seemed to work - I think sometimes they just want to know that their mummy will keep waking up for them lol