Swaddling probs 🤷🏼‍♀️

Anybody out there have any tips for a newborn that hates being swaddled? Our boy is 3 1/2 weeks old and very active, so if we put him to bed without being swaddled he kicks and touches his face and wakes himself up that way or he startles. If we swaddle him with his arms in he’s fine for the first few minutes he’s down, but then he tries moving his arms and gets fussy because he can’t move them up to his face (that’s where he likes them lol). If we swaddle him arms out then he touches his face and wakes himself up that way. And it doesn’t seem to make a difference if he’s wearing mittens. Overall he seems to do best with the swaddle if we can just get him past the stage where he wants to get his arms out. Any tips for helping him tolerate it?

UPDATE: We use the Halo swaddle sack. Forgot to mention that.