D.C.
Can you do sort-of a swaddle but without his legs and/or arms in?
When I was transitioning my 1st out of the swaddle, I would do the swaddle wrap just around his torso, with his arms out the top, and without doing the legs. I think it gave him a feeling of being held, with the tight swaddle around his body, but still gave his arms the freedom to do the 'touchdown' pose :)
Or, even just go part way, and leave one arm out, but not the other for a little while. Or if it's really the legs that he kicks out first, swaddle his arms but don't pull the bottom up so his legs are free. Try all the combinations until you find one that seems to help.