Around this age, I stopped following cues with DD1 and 2 and applied pretty much the same thing with DD3. I think the 3-2 nap transition is something to think about as this would be the typical age where they would start to transition (and in our case as early as 5 months). If I were you, I would start to stretch her morning A time (add 15mins every 3-4 days) until you get to 8.30am and then hold it there. With regards to the rest of the A times, i would see how well she slept for her morning nap to determine whether she can do 2hrs or maybe even 2:15.
If your morning nap is 8:30-10 and pm nap is 12.30-2, you will probably be able to do a catnap from 4:30-5 and bedtime around 7am. She may still wake early though and this might have to do with the transition. But slowly over a couple of weeks as you stretch her A times closer to 3hrs, you will find that there won't be enough time for a CN and you would do an earlier bedtime on those days or if the CN is too late then you could wake her about 20mins into the nap to make sure she goes to bed on time.
Are her naps 30mins throughout the day?
What do you think?