Happy Birthday Henry!
Our routine seems pretty similar to yours and Travis is just a month older. He has mid morning, mid afternoon and bedtime bottle the same. Whilst i am aiming to drop secong bottle soon, I intend to keep mid morning for a while yet. I stopped giving Travis milk 1st thing when he was 6 months and he has always been happy to get up have a play and wait for breakfast, without being dependent which i think is a good thing so I say keep going as you are if he is happy.
I also give mine plenty of water with meals and throughout the day.