This might sound dumb, but why not change him before you go to bed? By that time the dinner drinks would be in the diper already and then he has a "new" diper for the rest of the night.
I change my dd just before I get into bed and yes she does wake up, but she is soooo sleepy that she nods of very quickly.