Also, does your lo sleep on her front?? Just regarding the Night Notion....
Apparently the side snappers are better for babies who sleep on their front. We had a front snapper and are now swapping it for a SS for very similar reasons to you.
I've just had a marathon lanolising session in preparation!!
Lots of luck