Honestly hun you'll drive yourself crazy if you spend so much time thinking about it
... try and go with the flow as much as possible. The 2-1 can drag on for a few months. You can try a set nap but just watch out for OT signs and you can always go back to 2 naps if need be. We also had crazy nap days (like 2x40 min naps); super early bedtime (as early as 4.30pm once); super early and ridiculous wake ups until it smoothed out.
When we did eventually drop the morning nap, we started with 11am nap and then slowly pushed it out to 12pm so I think your routine looks good... just as long as its not causing her to get overtired and leading to night wakings