Excessive Gas Disturbing Sleep

Hi Mamas...I need to tap your wealth of experience and wisdom. My dear little 3 1/2 month old son is having problems with passing gas, both upper and lower. He's always been a bit gassy and a grunter, but it never disturbed his sleep before. Here's the background: about 4 weeks ago I started drinking Mother's Milk tea and then switched to Fenugreek capsules to help boost milk production for pumping. My sweet boy had an intense reaction to it (baby side effects can be excessive gas and stomach discomfort). I finally figured it out and stopped after about a week with immediate improvement. Since then he's been having problems at night (only) with burping and passing gas. He'll lay down for bed just fine and as early as an hour later wake up arching his back and crying. I'll burp him and down he goes quickly. About an hour later, it's the same thing. And so on, and so on. Last night he was able to fall asleep in his swing and sleep for 2 hours of blessed sleep for both of us. Some nights he'll sleep go down for 3 hours, then 2 hours, then 1 hour, then 45 minutes, then full-blown meltdown and we'll wind up sleeping in the rocking chair after an hour or more of crying and twisting. Another night he was up every 2 hours; so it was nurse for 45-60 minutes, sleep for an hour, then repeat. Early in the morning he'll usually pass a lot of gas and have an explosive stool. When he gets up in the morning he's all smiles, giggles, and energy as though the nighttime never happened, and the daytime continues fine. If there are any issues they are very mild and easily resolved without crying and writhing. I know that the fenugreek is out of our systems, but I also know that what we've been dealing with is nothing like what was happening prior. He was nursing every 3-4 hours with an occasional 5 hour stretch, and there was never any crying or twisting. Also, my son has a very happy disposition and has never been colicky. He rarely cries without a specific reason or need. Once that's satisfied, he's all smiles again. He's also gaining weight steadily and is right on his growth curve. What do you think? Is this normal for this age? Any ideas what is causing it or how to remedy?