That's great! Yes it sounds like touch more A time may be needed to extend that first nap a bit, so perhaps aim closer to 2h30 and see what happens? Can you AP a catnap if she refuses in bed? Car/pram etc? Sound like OT at bedtime today, it's to be expected as she moves towards transition but extending the A time earlier in the day will help.
I get you on the 7pm bedtime and I really think it depends on your child. DD tacked on sleep brilliantly - I put her to bed at 5.30 sometimes after a terrible day and she would sleep right until her normal 6.30/7am. We had some 13h+ nights for sure around nap transitions. But DS is more of an 11h night man, 11.5 if really really tired but that is rare. So with a 7/7.30 BT we get a 6/6.30am WU which works for us. Aiming for 12h with him got us into a mess at one stage and it was one of those occasions where bedtime actually did need to go later to improve things. May just need to experiment!