Hi Laura
I'm going to start with a couple disclaimers
I know that many LOs get OT from the long am nap/short pm nap. They don't feel rested enough at bedtime with just the catnap. Also, my LO was a cr@p napper, and on the high side of A times. So what we did may not work for all, iykwim.
Looking at your routine today, I'm going to guess you pushed a bit too hard. She probably needed more than that 5 mins. to get to bed. We officially moved to 1 nap at 12 months, but it was a several month process to actually arrive there. What was the A time before the AM nap today? I would stick with that for a while and see what happens, if she'll give you a 2 hr nap. At this age it really is so hard to tell OT and UT. As for the SA, I would say it is very possible. My LO was in the ER a couple months ago, and also in the hospital another time when she was 6 mos. and it really is traumatizing for them, I think. But just be very wary of that OT monster creeping in. Especially if you suspect teething.
Here are a couple of routines we used thru the 2-1 process.
W 7:00
S 10:30 - 12:30
S 4 - 4:30
B 7:30
W 7:00
S 11 - 1:00
S 4:30 - 5
B 8
W 7:00
S 11:30 - 1:30
S 4:45 - 5:15
B 8:30
W 7:00
S 11:30 - 1:30
B 6:30
W 7:00
S 12 - 2
B 7:00
Sorry, I know this is so long. But I hope it gives you an idea of how to juggle those catnaps. Once you hit the 4.5+ hr A time, you are so close, and may find yourself with some days of 1 nap, some of 2. The whole process takes a lot of flexibility (easier said than done!!!). You also might need to get creative with meals and snacks. I should also mention that we APOPed the majority of those afternoon catnaps.
Keep posting your routine, and we'll get a better idea of what's happening.