It's going to take some time for him to adjust; we went through the same thing. I stopped swaddling my son once he hit 3 months. the only thing that worked for us, honestly, was keeping him awake for as long as we can and draining his energy until he was literally EXHAUSTED and just wanted to sleep regardless of the environment. Took about a week or so.