Sianie - last night was pretty much OK in the end. I keep being amazed by how well she's coping with all my mistakes and just sleeping when she needs to

We did have one NW at 3.30am ish. I went in quite quickly, stroked her back, turned the nightlight back off and she was back to sleep. Never managed that so quickly before! Anyway, excluding those 10 mins, she had a 12.5 hr night. Today I kept her up for 5 hours (feeling very mean!) and she had a lovely nap. I had to wake her after 2.5 hours cos it was getting so we wouldn't fit in a very long A time before bed. Hopefully a good night tonight will give her the remainder of sleep she needs, cos she's clearly been very tired today.
Mama2C - When we were stuck with 4 hrs A time, a 20 min AM nap helped us fit it all in. We only did 2 nap days when she woke before 7 / 7.30 (with a 7.15ish bedtime). We woke her from her morning nap after 20 mins, which then shortened her next A time to about 2.75 - 3 hrs. We could then fit in about a 1.5 hour nap before 3.30. I'd always make sure she was awake by then to preserve night time sleep as much as possible.
Lolas Mum - Yep, we got stuck with short one nap days, followed by a few longer 2 nap days for ages. I thought the one nap days were making her OT, but looking back I wonder if the short days were actually making her UT and she could have handled a slightly longer one nap day. What happened after 2-3 one nap days was she'd wake at 6.15 am or something and there'd be no choice in it. But at least it made 2 nap days easier! When we started getting nap refusal after 4 hrs A time following a 20 minute nap we took a chance and did one nap on an earlyish (6.45 / 7am) wakeup. Been on one naps since! Probably could have done it earlier, but am glad I waited til it was clear 2 nap days were no longer working cos it gave me the confidence to stick with one nap. And even then I've been paranoid I've got it wrong!
Sorry - very long post!