Awful swaddle transition 😫😫😫

My 13 week old starting rolling at about 11 weeks. We are on two weeks of transitioning her out of the swaddle for night time and this is hell! We’ve tried the Merlin suit but she gets too warm, we tried one arm in one out but her startle reflex is too strong, we tried nested bean, we are currently using the zipadee zip with the band and some nights it’s fine and others like tonight i spent an hour trying to get her down. She discovered her hands so she sucks on them and then cries and cries. I go in put her binky in and hold her arms down till she’s calm then she has a startle and we are back to the beginning. Did anyone else try something that worked amazing? I’m open to anything!