There is a product called babycalm, that could help. It should induce sleepiness. I'm pretty sure that it is magnesium citrate. The other thing you could do is a bit of Magnesium oil on his skin.You could do these at the same time. Magnesium will support nerves, help create melatonin, and chelate some heavy metals.
Speaking fo heavy metals, if you are using alot of of Iron fortified foods, and iron vitamin drops it could be contributing to the problem. Iron is a heavy metal that they cannot leach out and it builds up in tissues.
Ncl zeolite can help if there is heavy metal buildlup and it is safe, even for babies.
Vit b complex drops will also support the nervous system. I put them under the tounge for quick absorption. Cod liver oIl is another good thing to impart a calmness.
Lastly, you could have food allergy issues on your hands. Milk allergies can cause cranky kids. sometimes grain is the culprit. Try to stick to natural foods and stay away from as much processed stuff as possible.
Be careful about fans in rooms, yes the noise can help, but for example when I sleep with a fan in my room, it stirs up dust and I wake up congested like I have a cold. Better to just have the baby in your room and leave the toddler in the other.