Good luck!
Yes, 5 am is awful for the poor moms who go thru it! We had 5 am wakings for a week after he first started STTN. I was worried that was our life! 6:30 is great, considering her bedtime. As she moves to 1 nap and A times get longer, bedtime will get later and so will wake-up. Usually when you first transition to 1 nap you've got an earlier bedtime/wake-up thing going on that becomes better with time.