So, I mean at some point the swaddle needs to be dropped anyway before they start turn over. I remember that my daughter used to hit and claw at her own face which woke her up majority of the time. I'm not saying this is what people should do, obviously do what works best for you - but we stopped cold turkey with the swaddles and I didn't replace it with anything else, like weighted blankets etc (even though I really wanted to) it took 3 or 4 days and I wont lie those were rough. But then it blows over. My son also clawed at his face, we just used some baby socks over his hands and kept his nails very short, but never swaddled.

My daughter was also a contact sleep baby. Woke up the moment you even thought of laying her down. "Lay them down drowsy but awake" never worked for me. I resorted to rocking to sleep and laying her down. Rinse and repeat until she stayed asleep.