5 month old still needs to be swaddled at night

okay so my son just turned five months old and he still needs to be swaddled at night to sleep.. he loves it.

we've tried the Merlin's magic suit and the nested bean suit but he wakes himself up all night long with his arms.

I'm starting to worry about his hips in the swaddle as well as him developing a flat spot.

he can roll from front to back and back to front.

I'm sure it doesn't matter but he's EBF and wakes 1-2 times per night to nurse for 5-10 minutes and then typically goes back to bed unless it's a rough night

ant suggestions?