I''d be inclined to keep swaddling though there is one consideration that you may want to look at. When you go to get him when he wakes, is he still in his swaddle? Or is he out of it? At some point, your baby will be moving more in their sleep, just as adults do. It may not happen for a little while yet but once they develop better motor control, they may find the swaddle restrictive. Babies are strong and can break out of a swaddle.
That said, if your child finds himself awake after a sleep cycle or two, (30 minutes in your case) and he is OUT of his swaddle, he has no way of self soothing. We all have sleep associations - as adults, we (most of us) require it to be quiet and dark to fall asleep. In your child's case, we encourage those sleep associations as well to indicate to the child that night time is for longer sleep. But he has another sleep association: swaddling. So when he awakes and is out of his swaddle, being nighttime, dark and quiet won't be enough for him to get back to sleep.
Parents will encourage to keep doing what works but at some point, you're going to have to give up the swaddling. For the same reason parents ween children off pacifiers, sucking thumbs, comfort feeding, etc., you will need to consider weening of swaddling - otherwise in another 6 months, you'll need to swaddle with beach towels! :)
But for now, 6 hours a night is a good rest for your baby boy and I think it's OK to keep going.
If you're considering weening him off, then you can start loosening the swaddle - maybe he's attached to the blanket in which case it's a security thing and just having the blanket nearby is all he needs. Best of luck.