I would try rolling a couple of wraps and putting them either side of him when you put him down wrapped. Will stop him being able to roll over and may help your problem until you can get him used to sleeping unwrapped.
Also you can try putting him down half wrapped - so leave his arms out, and wrap from under his armpits.

Good luck!

If all else fails, google Sleepy Wings.