Did/Has anyone...

I'm bf, baby is almost 7 weeks and these last two days he is so uncomfy. Seems like it's his tummy. He's so squirmish. When bf he'll whine sometimes, cry, kick.. Move around. Just overall not comfy. When he's sleeping he's the same way. Idk what to do or what it is. Tried gripe water and I think it helped a bit but not completely either. I try to avoid eating stuff that'll make him gassy (broccoli, beans etc) 

Any advice? I hate seeing him uncomfy not to mention I'm trapped all day cuz he's stuck on me otherwise he's crying. I can't eat or do anything around the house 😩