We initially had her bath in the morning as well and then moved it to the evening. You may want to try it again. They change so much that you just never can tell .
I think when they are still really young they get more and more tired as the day goes on so just watch her sleep cues closely and make sure she isn't getting overtied or going down too early.
Do you think she is waking at 8:30 because she is use to a feed at that time? If so, maybe you can slowly give her less and less at that time so that she gets the idea to stay asleep and then hopefully that will get her to take a ton of food during the dream to feed to help her get through the night.
Just a few thoughts...I am definitely not an expert
Keep up the wonderful work.
Melissa