It seems to me that the solution to everything would be to stretch her A. I know you said she is ready for a nap in around 2 hours. Just wanted to share that whenever E's time jumps, she still shows all the signs of nap readiness at the previous A. So for example, her time now is close to 4 hours (it's jumped again but we're still experimenting) but she will seem absolutely ready to nap by 3/3.15. But I know that if I try a) she will resist like mad as she is UT b) Then she will get OT in the process ruining all further chances of a good nap. If she is having trouble going to bed, again OT is a big culprit as they can't wind down properly. You're right though. Putting her to sleep at 5.30 seems a bit much. Instead you would have to keep the CN and push BT back. Not the best solution but only until you can increase her A, then you can bring it back to normal again.
Regarding your question about varying times to bed. When E was younger, BT was 7. No matter how the day went, I had her down by the time - more often than not 6.40pm. But that is not working anymore, especially since we are in some weird 2-1ish place. So anyway, now I adjust the BT depending on the length of the last nap and what time it ended. I'm just waiting for the WW to end so that things can get back to "normal"
