Snap, my little girl is a right good kicker! Though she was in the womb, so I shouldn't be surprised...
We gave up swaddling her very early on, as she just used to kick and thrash her arms and head so vigorously all her covers would be scrunched up at the end of the cot. She is happiest with her arms free, so I put her in a little cardigan so that her hands and arms don't get cold.
The other thing you can get is a little sleeping bag, which goes on over their clothes and zips up, so they can't kick anything off!
I have also found that she gets pretty restless in her sleep if she's windy... Which she seems to be a lot! I have taken her out of her cot still sleeping and been rewarded with a burp or even better a fart, after which she sleeps a bit more peacefully.
If he likes to be wrapped but kicks out of it, the baby sleeping bag is probably the best idea. They are sometimes called Grobags, and you can get them at most baby stores, although I have seen them for bigger babies (six months on) at Big W.