I need to continue to swaddle my six month old. She keeps waking herself up at night by scratching or smacking herself or other things. She also is now breaking out of her new swaddle. (Walmart SUCKS). I want to get an ErgoCocoon but a friend said her little girl broke out of hers all the time. I NEED something that will wrap her super snug and she can't get out of, but I also want something that will let me access her diaper so I can change it at night and not wake her up. Pleeeeeease help.