I would try swaddling him again, he is probably jolting lots. You need to do the swaddle really tight - if he can move his arms, it's not tight enough. If he's still escaping, the Miracle Blanket (US) or Mothercare swaddle wrap (UK) are reallyl good at containing even the best escape artists. Does he take a dummy?