Transitioning from swaddle—HELP!

My son has slept great (10pm-6am) for the most part, but only when swaddled. He’s rolled belly to back a few times and back to belly once, and loves rolling side to side when he’s on his back.

Because of this, we feel like we need to stop swaddling. We have tried Halo sleep sack with one arm out and both arms out. We tried the Woombie with arms out.

When he’s not swaddled, he’s waking up every hour and we are up with him for at least an hour getting him back to sleep, and he wakes up immediately once placed in the crib. We’ve been giving up and going back to the swaddle at 4-5am because we’re zombies.

Any suggestions or advice?! Please!! :)