We stopped swaddling DD when she started preferring to sleep on her side, so probably about 2.5 months. And now that she's a consistent roller, I definitely don't want to swaddle her! At her 2:30 am wake up last night, she was on her tummy. I put her down on her back. First time she's fully rolled over.
I'd say trial and error with your swaddling. Maybe try a few different ideas over the weekend, that way if LO has bad nights at least it's the weekend and you can hopefully catch up on sleep. I'd say even go as far as leaving LO completely unswaddled once...you never know.