oh my, the swaddle was a huge issue for us too. it seemed like "can't sleep with it can't sleep without it." We eventually got so sick of re swaddling 4 or 5 times a night, we lost the swadlle by putting him in a gro bag, with his arms swaddled, and a folded sheet over his legs, then zipped his arms in the gro bag, and lost the sheet on his legs.
Then after a while he worked his arms out of the holes, but even then I had to hold his arms down until he calmed enough to be left. It took close to a month(see my other posts) but I'm glad we did it as he seems much happier, and its lovely to see him sleeping like a starfish.
Plus at least I won't have to pop out to swaddle him when he leaves home! :lol:
Liz