LP - I think I just misunderstood about the CN. If you want to push things back, I think you're going to have to work on that longer A times first. If 10 and 2 are the times that she will go, try doing 10:05 for a day or two. Then 10:10. If you think 15 minutes are too drastic, which they definitely can be just move it back by 5 minutes. Maybe start with the am one first. If she naps well, then try the second A time too, but if not, you may have to move the second nap in a touch to prevent an OT baby.
When S does a CN, she does 30-45 minutes and then will go about another 1.5 hours until BT. So we don't get the full A time. Maybe your DD is similar in that you think she could do another 2 hours, but since it was such a small nap they aren't able to last as long.
MoT - It sounds like now you're dealing with an OT baby. If she wakes early from her nap again, maybe just opt for an early BT. I know that with my son, if he's had a poor nap day and we do an early BT he will still sleep until his normal wake up time. If she does end up waking up early anyway, then adjust the day accordingly and then you should be able to get a CN in. I think even if you've officially dropped the nap there will be some days that she will still need one just due to circumstances. With DS when we went from 2-1 there were times he would be okay with 1 nap, but then need 2 to catch up on poor sleep.