Personally I would start by capping one of those nice long naps a bit shorter - as you're getting EWs you need to either make that first A time a lot longer or cap the first nap so that you're aiming for a UT nap anyway.
I wouldn't be suggesting that you get up at 4.30am, you might need to start encouraging her to stay asleep in her cot with some ST, but for now, see if the nap changes make enough of a difference on their own.