Brooke, I noticed a marked improvement in Zara's nights when I made sure she had solids before bed - not right before bed, but maybe an hour before the bottle. She wasn't so hungry in the mornings then, which gave me a chance to work on her wakeups. I think the solids take longer to digest than the milk. I always make sure now that her "dinner" includes vegies and some protein.
Other than that your schedule looks fine for eating. For a while, be prepared to offer more than he normally has, so you can see just how much he will eat....then you can adjust how much you offer to how much he actually does eat.