I would definently try wrapping him tight, babies love to be snug. I also got my baby an Amby baby hammock, he now sleeps lot longer periods and can be put in there awake and put himself to sleep (I got it at 10 weeks old). You can hire the Amby hammocks, just google "hire for baby" and there may be one in your area.