Sorry Laurie,
I'm terrible for rechecking posts that aren't on my board.
Ok lets see ...
I think whatever you try you need to do it for 4-5 days consistently to give it a chance to work. Keep a sleep diary so you can see any patterns etc.
Personally, I would keep her up until as near to her normal nap time as possible. The reason for this is to prevent her using the first nap as an extention of (missed) night sleep. Some babies do better with this than others, some just get too tired. Then I would give her a short AM nap to prevent her making up for lost sleep here and prevents this nap from robbing from PM nap. PM is important for good night sleep so I would encourage you to give her a good solid PM nap
Then I would go for a normal A time for the 2nd A. Not longer than usual but not shorter either. As she has only had a short AM nap you might find she needs to go down a bit earlier, but prob will be fine. Hopefully, because she has only had a short AM nap *and* a normal second A she will take a good PM nap, seeing her thru to bedtime well *and* setting her in good stead for a good night.
You might find that she struggles with staying up from EW til normal nap time AND having a short nap. Watch her cues and the clock and play it by ear.
With regard to the EW and feeds, does she take a good feed if you offer it right away? Does she then go back to sleep right away or are you still stuck with the EW? If she goes back to sleep I would treat it as a NW and a NF and then gradually reduce what you give her/move it nearer to morning.
OK .. that's my tuppence worth from my own experiences! Hopefully others will chip in too x