At night, I double swaddle him - an Aden & Anais blanket, then his swaddle sack over it, and it works like a charm. For naps, I have just done the swaddle sack. But I may have to start doing both. my son now wakes himself up by breaking out of his swaddle and playing with his hands lol!
I've tried letting him sleep without his swaddle, but he plays with his hands instead of using them to self-soothe lol
I captured this picture on his camera monitor lol he's so funny. He just "plays" when he wakes up and gets his hands out!