Would he have a nice long deep bath with one of you about half an hour before bed. I don't know if a massage would work at that age but it works on mine when they are under 1.. Worth a try..

good Luck for tonight