Swaddle transition

So we’ve swaddled my little guy for the last 12 weeks and it’s been pretty good. But now he’s very close to rolling back to front, and keeps breaking out of the swaddles, so I need to stop. The issue is he still startles and the second his hands are free he is hitting hit face. My friend just tried the nested bean sack and said it was awful, it actually kept the baby up more. I have a Merlin suit I’ll try, but it didn’t work with my daughter. I’m thinking about buying a zipadee zip. Has anyone tried it? Or do you have any helpful ideas? I’m back to work in 3 weeks and really would like this somewhat taken care if haha