HELP!! Quitting the swaddle!

My little guy is starting to roll so we had to stop swaddling. His startle reflex is so strong still and he will only sleep for 30 minutes then spend the rest of the night tossing and turning, literally every minute. He falls asleep then within a minute he’s startled and moving. I don’t know what to do. He sleeps so good with the swaddle and so horrible without it. Is this something that will just take time? Any tips?! I’ve tried swaddling with arms out but it was the same.