I would try and wean the swaddle. I don't know if it's better to go cold turkey or not though. You could try the one arm out method, and use a positioner to keep him on his back. Or, you could just unswaddle him and put him on his tummy to begin with and see if he settles to sleep. Good luck and write and update.