Melissa - did you consider pushing her nap later? Is she still generally napping for 2hrs? If so I would say you need to start cutting it down hun. We are about to start capping at 1.5hrs. I don't like doing it, but it is necessary, b/c his nap is stealing from his night. He either wakes early or he takes forever to settle at bedtime.
WRT moving the nap earlier due to the EW - if you feel the EW is down to her being overtired it can help in the short term i.e. for a couple of days, but if you do it for longer you are right, it will encourage her to keep waking earlier. Your best bet is probably to shoot for around 6hrs A, so nap at say 12 & then in 3 days time push it 15mins later, so 12.15 & so on until you are back where you want it to be. I think if you want to get back to your 8am WU's you need to be aiming for her nap to be more like 2pm and probably capped at 1/1.5hrs max, or she'll not be ready for bed at bedtime.
WRT today, I'd say her nap was an OT nap at 1hr, which I'm sure you already know. I would probably pull BT earlier to around 7pm & hope she tacks on overnight.
HTH.xx