colic? gas?

I am so lost right now. My 3 week old son has always been pretty gassy and hard to burp. He is fed on the bottle (latch issues we have been working on) with a combination of pumped breast milk and formula...only gets maybe 6-10 oz of formula a day and the rest is breast milk, taking 22-30 oz total liquids daily. He had a lip and tongue tie taken care of on Tuesday. Wednesday afternoon he started fussing at the bottle. We figured it was pain from the procedure, gave him some Tylenol that night, and figured he would be better soon. That night was awful... fussing at the bottle, barely able to take in anything but acting like he is starving, and crying/shrieking. He did calm for a bit and took a couple of ounces. Today we went to the pedi to have her look him over. He had about 2.4 ounces in the office fairly easily. She figured it was likely pain from the procedure and recommended smaller, more frequent feedings. For the gas we had already been trying Similac sensitive and cutting out dairy from my diet, but so far that hasn't worked so she gave us a can of a non-dairy based formula. Then this afternoon I had him at another office for our latch issues, and the doctor there witnessed one of his feeding freak outs. She said it wasn't pain from the procedure, but colic. She said he was drawing up his legs and it was the gas that was bugging him, so she showed me some stuff to do to try and help him move the gas bubbles along. I called the pedi to get her opinion, and she still thought it too coincidental that the fussiness started 24 hours after the procedure. Tonight it has been more of the same and I am at my wits end. We finally got him to take about 3oz within 30 minutes (an ounce at a time). But his default is still to cry and even scream when it seems like he wants to feed. He is still farting a lot, but even passing gas doesn't seem to help that much. He only had about 14oz the whole day, for Thursday. I am calling the pedi tomorrow and I am sure, with the diminished intake, that she will want to see him again tomorrow. I just feel so helpless to help him and figure out what is going on. Plus, hubby and I are now arguing about bottles... we had previously used playtex bottles with the drop-in liners, but switched to dr. browns on the recommendation of the lactation consultant. Hubby blames the dr brown bottles, even though we had been using them exclusively for the last few days and the issue just started. He also wants to just give him the formula and no breast milk for awhile, to weed out the possibility that I am still eating something that is making his gas worse. So I am pumping and storing, but also worried I will lose my supply as it is hard to pump when your baby is crying and not sleeping much. I just want to cry (for the millionth time).