K.D.
My son went through the same thing at that age...I used to give him warmer than usual baths before bed, put his towel in the dryer so when he got out he stayed warm, and I did infant massage with a lavender bedtime lotion. This helped him tremendously to relax and sleep. Also I wrapped him tight with a blanket out of the dryer. He was an overall happier baby with the massaging. Also try singing softly to him while massage. Also if it is a teething issue, I used sore throat spray for his teething, its easier than orajel my doctor recommended it. Good luck!