I swaddle her when she was in hospital as I had to have a C-section, when I came home I did not swaddle anymore. I had to swaddle at 12 weeks when she knew she had hands and feet that moved. Like you my DD jerked and she wouldn't get to sleep, so I started to swaddle again. Like a dream, she had no problems with naps or sleeping at night.
Also my DD has 2 teeth and showing signs of it again, she chews on her fists something rotten, so I personally go with the swaddle.
My DD still sometimes cries or fights the swaddle but once she is in it, she loves it.
Go with what you think is best.
PS what sort of baby is he?