I am not an expert, so while you wait for someone else I had some thoughts! It seems the 'E' is the thing thats missing in your routine, and as you have said you L/O seems to be a "snacker".It may be that that is what is causing his night waking.
Do you have "the baby whisper solves all you problems"?
There is a great section in PU/ PD about helping a LO of your age, on to a good 4 hr routine. Perhaps extend the bottles to every 3 hours, and be firm to throw it after 1/2 an hour of the set time. This will obviously upset your LO, but he should be hungrier next time, and take more feed.
How does you LO fall asleep for naps, as they seem quite good?
Also don't let anyone tell you he's asleep too early, that's a great bedtime! The reason he'll become cranky after 8.30 is that he's over tired, and his nighttime sleep will be worse
I feel for you with moving and all, but you still have time to catch this and get it fixed, it'll be tough but worth it!
I hope to have helped a bit....
Liz x