hi,
As soon as Jake rolled over I started weaning him from the swaddle. I felt the same as you about the dangers of rolling over while tightly swaddled. After doing this he soon discovered that he likes to sleep on his side and sometimes his tummy.
Has he only been swaddled for 4 days or longer? If its only 4 days I'd stop, as it will be easy. If it's longer, perhaps try the "one arm out method" This usually ends up with them breaking totally free anyway.
Also I went to a 4 hr EASY at 3 1/2 months as Jake had night waking, and short naps, if you feel he's ready for more A time, there's a great bit in pu/pd in the 2nd book on how to go abut it. It worked great for us!
Good luck,
Liz x