Swaddle transition

Baby is 12wks and loves to be swaddled but he also likes to escape his arms up when he feels like it. Basically needs the compression but ability to move arms. If he fully gets his arms out he doesn’t sleep well. I tried the arms up Swaddle our daughter liked and he hated his arms being stuck up. Tried the zipadee zip but it has zero compression so he didn’t like that either. Any suggestion? I’ve never had a baby enjoy a traditional Swaddle so much .