We wrapped my DD for all sleeps until she was a bit older than your DS2. It used to be her cue to sleep. Have you tried playing a certain soft music to him? You may find you can leave him alone once he gets the cues from that as well.