I think your key is that first A time, esp if she's waking up like that. It does take them a few days to settle into a new A time when they're adjusting so don't be afraid to push another 5 minutes or so -- what's her temperament (as far as you can tell)? After a short nap, try cutting your A time by about 15 minutes, so maybe around 15 minutes less and see how it goes -- otherwise you get stuck in an overtired/undertired loop. Also, it's entirely possible that your second (and third) A times need to be longer than your first -- mine all did their longest A time first thing in the morning, but some babies do their shortest there.
So, try to keep that first A time close to 1 hour 25/30 minutes -- if she short naps then cut the second to something closer to 1 hour 10/15 minutes and see what happens. You sound like you've got the right idea in playing with a times.