I do wonder if NWs like that are discomfort and it is teething. Maybe try meds before bedtime tonight?
I know it is hard but I think those short naps are UT with the short A time. Not sure what to suggest when she is falling asleep as she is so tired from the NWs. Seems cruel to keep her awake but wonder if that would be best, even if just for another 15 mins.
Olly always did his longest nap first then his cat nap last but maybe she would prefer her CN first? I seem to remember (we are talking 5 years ago) some babies prefer that?