Lovely husband you have there Team 
I know people who have swaddled for ages, like 10 or 12 months. I know you want to stop, which is fine, I was just saying though that you don't have to.
Swaddling is like marmite. Some babies really, really love it. Some babies really, really hate it. My DC1 loved swaddling until about 12 weeks then hated it. DC2 was swaddled for about 3 weeks. DC3 hated it from birth, DC4 is loving her swaddle. Your baby evidently really, really loves it. If it was me, I'd just go with it.
In terms of potential danger of rolling, well babies sleeping on their front is generally considered dangerous but I recall on this thread we have quite a few babies being put to sleep on their front or side - all have been fine. What about getting one of those angelcare monitors if you are worried?
What I do (DD is swaddled sometimes) is use an additional sheet over the top of the swaddled baby and tucked in tight. This makes it difficult for her to turn over (and I've also found it useful for transitioning out of the swaddle, since it is tight and secure).
I also have DD sleeping right next to me in a bedside cot and wake whenever she moves, so I'd know if she had rolled over.