Swaddling is great! Don't feel bad about it. Some babies will cry endlessly and all they need is to be swaddled and they calm right down. It's a very comforting thing for babies to be swaddled.
Your baby is very young, I personally don't ever try to stop the swaddle. I swaddle until the baby is done. Mine have been closer to six months when they stop. They do it themselves. One might have been closer to nine months (hard to remember!). But, when they aren't interested in being swaddled anymore, they pull their arms out or refuse to let you wrap them up. It is a transition to not be swaddled anymore. But I find it's a lot more helpful when they are older and not doing the baby-arm-flinging-out-because-they-think-they-are-falling thing because that will keep waking them up.
Anyway, so my suggestion is to keep swaddling. Enjoy the nice sleep for now. He will let you know when he refuses to be swaddled. Regardless of whether he's swaddled or not, babies start having worse periods of sleep starting around 7 months due to learning and development. I find the first six months to be much better sleep typically;-)
Good luck!