With the 6am WU - no I wouldn't treat it like the start of the day unless you want to be stuck with it! Is she actually hungry when she wakes or does she just lie there chattering? If she is happy I would leave her to it and then get her up closer to her normal WU time for the first bottle of the day. If she is upset and genuinely hungry at 6am then I would feed like a night feed and put her back down until normal WU (even if she doesn't go back to sleep, which she may not). I would then skip the morning bottle entirely - I used to do this with mine when the night feed became a bit-too-early morning feed and it seemed to work ok.
Routine-wise I think she could possibly do with some more A time in the earlier part of the day. You weren't getting a full nap (1.5h or more) so I would suggest perhaps she needs a shake-up of her routine to see if that helps with the early wake up. Was her first nap always at 10.30 regardless of whether she woke at 7 or 7.30? Or did you work on A times? If you were doing 3h A time, then I'd suggest pushing that out to 3h15-30, counting quiet awake time pre 'official' WU as half A time i.e. awake in crib for an hour counts as 30 mins A time. It's not an exact science, and you may need to adjust, but that's often a good starting point to work from
You may find if you can get the morning nap to lengthen out that she only needs a bit of a shorter nap in the afternoon, and then that may in turn help the night.
A typical routine at this age might be something like:
WU 7 and bottle
Breakfast at 8
Nap 10.30-12
Bottle at 12
Lunch at 1
Nap 3.30-4.15/30
Dinner at 5
BT bottle and bed by 7
I think 8 months is about the time many babies drop to 3 bottles, though there's no rule says you have to! The total milk volume should stay the same so for example instead of 4 6oz bottles you may give 3 8oz bottles x
