Swaddle thoughts?

 Minnie is a great sleeper, and I really shouldn't complain. BUT WHEN HAS THAT STOPPED ME?

Here's the thing: She needs to be swaddled to sleep. This is OK for naps. She only sleeps 45-90 minutes, and we can easily check on her. When she wakes up, she's pretty vocal about it, so if she were to roll over in her swaddle, I think it would be fine. To be clear, we have never found her on her tummy after a nap, and she typically gets her arms out of the blanket and has her legs wrapped up. She's either on her back or her side-- sometimes facing a different direction, but whatever.

Also, I have no problem with stomach sleeping once a baby can roll herself onto her own stomach. AND she has a Newton mattress with a breathable sheet. You can literally stick your face up to that thing and breathe normally. I do worry, though, about being all wrapped up and rolling over-- would she somehow get her blanket wrapped around her face, etc?

Which brings me to my problem (that really isn't one): NIGHT TIME. So, she wears a footie pajama and a fleece sleep sack. But! In order to fall asleep and stay asleep, she needs to be wrapped in a receiving blanket swaddle over the top of this get up. I don't want to leave her like that when I go to bed, though, because I worry that she will come unwrapped and get into an unsafe situation. And with the sleep sack on, she might not be able to free her legs, blah blah blah. So, I unwrap her, but then she wakes up and it's a whole THING. With the other kids, they would start out in their rooms, and I would bring them in with me at first waking until eventually there were no more wakings. This is what I would like to do with Minnie, but the swaddle is disrupting us. The other night, I tried to not swaddle her, but she kept flailing the whole time she was eating and would not fall asleep-- until I wrapped her up like a baby burrito.

Any thoughts? I would prefer NOT to buy a sleep suit contraption. She is thisclose to rolling from back to tummy on the regular and has done it from time to time, so I don't want to buy something she won't be able to use for very long. Just keep her arms out of the swaddle for a few nights? Go cold turkey for naps? None of the other kids did anything like this, so I have no experience to draw upon.