Hi KB,
James is about the same age as your lo and I found I was feeding almost every 2hrs between milk and solids and he was drinking a lot. So I moved his first bottle and mid morning feeds to be at the same time as his breakfast and lunch. So our morning routine looks like this:
7am: bottle and breakfast
9am: nap
10:30am: water and snack (fruit)
11:30am: bottle and lunch
1:30pm: nap
I give a bottle at 3pm and he drinks all of this know including the ones he has with his meals. I also thought this routine would make it easier to drop the 3pm feed when he doesn't need it. I think a nurse told me that when they don't drink all of it for about 2 weeks in a row, then you can probably drop down a feed.
We have been doing dinner at 5pm and his last bottle at 6:30pm. My goal in the next few months is to maybe bring his dinner to about 5:30/6pm and give him his bottle at the same time.
so far this routine is working for us, although we are having much earlier wake up times than yours

James is up between 5:30 - 6:30am. If he wakes early, I give him half his milk when he wakes and the rest at breakfast. It sounds like they are eating the same amount of solids as well.
Sorry for rambling, I hope this makes sense.
Lisa mum to James my textbook/spirited koala