Thanks for your response. If she wakes early I always try for up to 25mins to get her back down, this often makes her quite mad! If this doesn't work I get her up. She's usually in a good mood even if it's been a short nap and as soon as I unswaddle her she's all smiles.
One question, if she only naps for 30mins, should I make her next awake period much shorter, say 1 hour? Or should I stick to the 1.45 - 2 hours? Is there anything else I can do to help her transition between sleep cycles?
I tried today with awake periods of both 2 hours and 1.45 but it didn't make much difference. I'll keep playing round with it in the hope I find the magic combination.
On the plus side she went down super easily for bed tonight. 2mins of shush-pat and she was asleep, if only naps were so easy!