take a look at Continuum Concept by Jean Liedloff. Having the baby be an extension of yourself whole day long, including during the night, will strengthen his self perception and confidence to a point where he should be way more serene and peaceful.