Aww what a cutie. A little amnesia does help the desire to have more kids, I think.
Our fifth child is 5 months old and every one of our kids has loved being swaddled, so we've definitely gone through that rough patch before. Now for the remembering part...
As I recall, figuring out why they don't sleep as well when they're not swaddled is key.
We had one kiddo who was old enough to bust out of a swaddle but would still whack her arms in her face and startle herself awake. For her, a Woombie was amazing. She could still wiggle around in there more than a super tight swaddle but she couldn't get her hands out.
Our current baby just liked the ritual/routine of being swaddled but ended up sleeping better with her hands up by her face. For her, a sleep sack is great. She gets zipped in and kicks her little legs in there and knows it's sleep time. Plus it keeps her from getting her legs stuck in the crib rails, which would interrupt sleep and frustrate both of us. (The brand isn't important... lots of companies make something similar.)
Both of those kids ended up preferring to sleep on their stomachs, but they could easily roll off of their stomachs even with the woombie or sleep sack on so I wasn't worried about safety. Hopefully that makes sense?
Of course there's another option: Quit swaddles cold turkey. We did this with two of our kids who generally slept fine in other settings (car seat, front pack) but liked being swaddled in the crib. They probably spent a week rolling around more and exploring their new freedom but figured it out and started sleeping soundly again before I lost my mind. ;)
If you're doing the math, that leaves one more baby. He fell into the cold turkey camp but we ended up using the pack n' play for a while because he kept getting his chubby thighs wedged in between the bars of his crib after we stopped swaddling him. He also would inchworm his way backwards into the side and bonk his head. This was unpleasant for all of us but the mesh sides of the portable crib were much better for him!
I hope there's something in here that's helpful. Obviously it's been a learning curve for us with each baby, but sleep is critical enough to put in the effort to figure it out. Our kids have all been great sleepers at night, by and large, but not without a little detective work on our part. Good luck with that sweet baby!