Sounds Spirited then
If he's hungry, I would make sure to increase his calorie intake, preferably with good fats. Will he take avocado from a spoon? Lots of good fat in that! If you're giving him yogurt, make sure it's full-fat. And as you're nursing, alsomake sure you're getting enough good fats in your own diet.
Has he only recently been getting dairy? Might there be a connection with that? Some LO's have a hard time settling with tummy discomfort. (Been there done that with one of mine
)
For sleep times, will he accept a massage, or even joint compressions? Both mine still get massages at bedtime, and they're 7 and 10-1/2YO!
Helps them settle, has always helped to ground them, as long as the touch isn't too light - tends to be "tickly" if too light.