L.M.
I lose the swaddle. Babies need to learn how to move around and they change positions at night when sleeping too. He can learn to self soothe...either sucking on hands on eventually finding his pacifier and putting it back in his mouth. My son hated the swaddle and always kicked and wanted out. I'd try a sleep sack instead. And if he is keeping you from sleeping due to noises or kicks, I'd move him into his own room. You both need to get lots of good rest.