Thanks so much for your comments

They really help to put things in perspective.
Ok, so I think I"m going to try for the 1 nap tomorrow because, like you said, she's been tired enough at around 8 but only ends up falling asleep after 8:30!
I"m just a bit confused about her sleep requirements because even though she fusses so much before falling asleep once she gets to sleep she will keep sleeping if I don't wake her up???!! I"m confused. Same applies to bedtime. She has a few odd NWs the past 2 nights but at 7:20Am she's still sleeping and I have to wake her up and she's not too happy to be woken.. what's that all about?
Yesterday for example:
Wake - 7:20ish AM
AM nap - 10:45 - 11:30ish
PM nap - 2:45 - 4
Bedtime - 8:30 (was cranky at 8 so I took her to bed, but didn't sleep until 8:30!)
NWs - 1:50, 3:30ish and then slept till about 7:15 when I woke her this AM.
Is she unhappy being woken from all her naps? and perhaps is cranky because she's tired but not tired enough to sleep more?
I am hoping moving to 1 nap will solve this problem. Tomorrow I don't know if she'll nap at childcare but if she doesn't I"ll try a 1 nap day with 4h45 mins. Hope for the best!