It sounds like resetling her means she is happier in the day...so I would keep doing that!

I haven't found anything that helps with the night so far. Even when she self settles she still wakes (at least twice) in the night.

Honestly, I think some babies are just more wakeful. Do the things that you enjoy and that get you through the day.

wakeful babes are tiring!