That sounds pretty good! Hopefully that routine will stay consistent over the next several days and we'll see if anything happens to the NWs.
As for OS, I was thinking that because of the long A time (and subsequent 35min resettle). Basically, you just want to try to keep the last 30min or so of A time a bit calmer (if at all possible). Some people put their LO in a sling or carrier, some just bring them to another room more free of distraction (like a bedroom), some use a longer wind down. It may not be the case, but just a thought I had and something to try.
WRT patting, you don't need to use something else, necessarily, esp not in the MOTN, but I think it's worth a try lessening it in the afternoon, so she doesn't end up counting on that to get to sleep. It's not uncommon to have a small prop issue come up after developmental milestones, etc, you just want to make sure it doesn't stay. So, give her all the chance she needs to settle herself (i.e. don't intervene if she's just mantra crying/fussing) and if you do need to intervene, try to do it to a minimum (only to calm, not to sleep) and hopefully you'll have to do it less and less. Does that help?