Is he waking up near the same time every night? If so, wake him up and re-comfort him before he wakes himself up. Breaks his body's habits, and resets after a week or two (YMMV on the length of time). That was the advice from our (general) doctor.
We also tried gas drops, as we noticed sometimes he just burped and went back to sleep after half an hour of extreme crankiness.
We also tried gas drops, as we noticed sometimes he just burped and went back to sleep after half an hour of extreme crankiness.