Don’t want to lose swaddle

Me

We are NOT ready to transition out of the swaddle yet. Without it our baby will only sleep 30 minutes on his own. However he’s grunting and trying to escape out of it after a few hours of deep sleep. He wiggles so much he gets to the bottom of his bassinet and wakes himself up kicking the edge. Is it time for a Merlin suit? Stick it out with arms out of the swaddle? Move him to his big crib?