Swaddle alternatives???

My baby is almost 4 months old and I’m very aware that she will begin rolling over soon and I’m dreading the day honestly. Only reason being, when they can roll from back to belly then they can’t be swaddled anymore. Well my baby REFUSES to sleep unless she is swaddled tightly. And I mean, I have tried to wrap her with her Velcro swaddle just around the chest with her arms out and she cried for like 30 to 45 minutes in her bed. (Don’t come for me. We are cry it out kind of parents as long as she is fed and in a clean diaper.) As soon as I adjusted the swaddle to put her arms in it, she went out. She does this every time. I can swaddle her completely and she is out within minutes. So are there any mamas who have had to transition their stubborn baby from being swaddled to not? And how’d you do it or what did you use cause I feel like if we start now, it’ll be easier when the time comes.