Hi, I have definately been there with the early wakes.
The long am nap can reinforce the early wake, so you could start by cutting that back a bit
so being that she is waking early, try:
she wakes at 5:30---but leave her in her crib til desired time of 6:30 with resettlling if necessary
nap 1 9 for 30 or 40min at the most and you wake her
nap 2 1-2:30
bed 6:30/6:45
HTH
I think you have deal with te ealry wake before moving to 1 nap completely. many at this age are on a 30min am ap and longer pm.