I think you are doing great, Infact I think the milk is slightly lower... my ds#1 didn't like baby food NEVER wanted to ate Jar/bottle stuff & only ate finger foods...ds#2 I only give home made stuff & just offer until he loses interest...no idea ofo quantity.
i don't think there is a hard & fast rule, but you just need to make sure they are getting a good variety & PLENTY of fluids... I bf, but I think at this age they should be getting a min of 24 oz Milk + other water/dilute juice, so maybe the early wake up is thirst rather than hunger...which is actually where the milk comes in these days as "nutrious liquid" rather than food
Kim - Liam's bf & I do bf before solids too & that is how it is recommended in Australia, to give milk before solids until 9-10months & then swap it around. So I don't think you are doing it wrong...although I do 7.00 bf + solids, then bf 11, then solids, then 3pm bf, then 5.30pm bf, then solids then 7pm bf & bed & mostly I can get him to go the night through, so maybe that might help get rid of your 3/5am feed