Transitioning out of swaddles

Ma

My guy just turned 3 months and is rolling all over the place so I need to get him out of his swaddles. We’re using the Love to Dream 50/50 swaddles, but we haven’t taken the arms off yet because he wakes up when his arms are totally free. Has anyone used the Merlin magic sleepsuit? Are there any other products you would recommend for easy transitioning without disturbing his sleep schedule?