She is 6 mos, right? Have you started solids? If not, when do you plan to do so? If so, that may be part of the issue, some bubs have a bit a time getting adjusted to new foods in their diet. Is she teething or doing anything new developmentally?
It looks like you're adjusting her routine daily based on what she needs, and that's exactly what you should be doing. She's a bit young to be dropping the catnap, but is probably in the process of doing that - so that means some days she may need it and some days she may not. If she hasn't napped well earlier and you try a catnap and she doens't take one, you can put her to bed a bit earlier.
when she wakes early, have you tried using pat/shh to get her back to sleep? I would only use pu/pd if she's crying and you cannot settle her with pat/shh. Also, after returning from holiday, it may just take her a bit to settle back in to a more normal routine.
I think you're actually doing a really good job of listening to your lo!
michelle