So it's still almost 13 hrs isn't it? I must admit I'm finding it hard to work out what to expect with a night longer than 12 hrs.
If you look at the total sleep in 24hrs with your normal routine it end up round about right, so it's kind of hard to see how to change it around without expecting an extra 2hrs sleep iyswim?
I guess I would keep the first A as it is for her usual nap, and start trying to push the A from there really. It isn't always OT that makes it harder for them to settle, some babies can be very 'clock' orientated and need a big of a push to get them past an old nap time. My DD was like that - I remember her being tired at am nap time for about 2 weeks when I was dropping onto one nap. If she had her way she would have kept on 2 naps and lots of night time parties

. Once we pushed past it everything was so much better.
So I guess you need to decide whether her pattern that she has at the moment is acceptable or not. Of it isn't then I think you will need to cap the night to get past the cat napping in the afternoon. But that might initially make the nights more unsettled

.
If it were me I think I would be tempted to get to the magic 6 months when you can be quite sure that most babies need 2 long naps and a 12 hr night, so can more towards a more 'known' routine....

. You also know the developmental short napping should be ending (unless they are genuine cat nappers).