Transitioning away from a swaddle

KM
My little boy will be 4mo this weekend and he can roll from back to front, but not front to back. He definitely loves to be swaddled and sleeps great that way for naps and night time. But with him rolling we need to stop swaddling ASAP. A couple of naps with one arm out were disastrous, and I tried to put him to bed with one arm out but I caved after 45min of him fighting sleep or falling asleep but waking himself up and swaddled his arms again. He was asleep in an instant!
Product recommendations for the transition to a sleep sack?  Methods to make it less painful for him and for me?