Gas Relief ??

Hey ladies! So FTM here. My baby boy is 5 weeks old and has pretty rough gas pains. He will eat (breastfeeding), be awake and happy for 15-20ish minutes, then go to sleep. After being asleep for usually only 40 minutes he wakes up from gas pain grunting and crying, and the only thing that consoles him is nursing. The doctor has said it’s pretty much only something he can grow out of, and suggested gas drops and tummy massage. Tummy massage/bicycle legs work only half the time. We’ve been using gripe water but I don’t think it’s making much of a difference. I was wondering if anyone had any other ideas or drops that might help? Desperate to get some sleep for baby boy and myself lol