swaddle help

My 4 month old cannot sleep well without being swaddled. He still has tiny bit of startle reflex and wakes up within 10 minute if he isn't swaddled. He has started rolling over in his bassinet so I know it's time to take the swaddle away. Any tips on an easy transition? He is already going through the 4 month sleep regression so should I wait to remove the swaddle till after the regression and things get back to normal?