It was suggested to me to wrap with the arms out. They still get the secure feeling, but they can move and suck their thumbs or whatever. I found it worked, but it took a while because she'd wake herself if she was too jerky in her movements. I think no matter what u do, it will take some time for bubs to adapt..... Hope u find an answer that works for u soon and u can get some quality sleep again honey!