I don't have any advice, but I'll tell you what I do.

DS usually has two sleeps a day - one is about 40 mins, the other is 1.5+ hours. I don't resettle DS after that 40 min sleep, as he is usually wide awake and quite happy.

As I've probably mentioned to you before, DS also doesn't sleep well at night. Usually at least 3 wake ups, but often more... though having said that, last night he only woke twice - bliss!!!

I'd say just keep doing what keeps your DD happiest - no one wants a grumpy, tired baby!