When to transition out of the swaddle...

My baby is just shy of 3 months old. Not rolling yet but sometimes when he plays and gets his legs going he can get himself to briefly roll to the side but then goes right back on his back. He is swaddled for naps and bed time and does great with it. Ever since last week when he discovered his hands, during the night only once i will hear him fidget grunt cough and then cry, I’ll look in his bassinet and his arm has wiggled out and hand is in his mouth but he’s asleep so i think his fingers make him gag, i reswaddle him and put him back and he’s fine for the rest of the nught. Are we at the point of transitioning,?? We got the zen sleep sack by nested bean to start to help the transition (we use it during naps) but I’m not sure if he’s ready to be out of the swaddle yet. Thoughts??