I'm interested in this and so listening in.
If we get EW then I still try not to move the AM nap too much earlier than normal, as I don't want DD to get used to waking up early. Is it cold in her room?
2 hour naps are really long for this age, I wouldn't let DD go with that (does help push the day out later though, but we cap at 1.75 max). If you're getting the short AM nap then definitely try pushing her first A a little longer.
We do EBT often (still trying to get longer/later naps by pushing A times out), and I find that DD's nights range from 11-12 hours, with shorter on nights that have a later BT (so she can wake up at 6 from a 7 BT, but the next day wake at 6:45 from a 6:45 BT). I have stretched the last A to 3.5/3.75 hours b/c of 2 short naps, but only that long if I see her playing nicely before I change her to bed, if she's cranky/clingy at all then I would put her to bed after 3.25 hours (which I do when she has good naps).
But saying that, we do still have 2 NW's which are quick feeds, but have been going on forever and I'm hoping they'll stop soon (but I've been hoping for 7 months now!)