So glad to hear things are going better these days
Yes it may be that with your family routine you need to do a UT pm nap, possibly APOP if she struggles to do that, it sounds like you know what she needs/prefers sleep wise, so go with those mummy instincts
Feel free to post your routine etc again if you want to put heads together for tweaking, perhaps start a new thread if the issues have changed from the subject line of this thread (as it seems they may), but for now if things are working, then enjoy