Rough running, lunges when accelerating?

On Mother's Day, a huge storm hit, and I ran through a huge puddle. It went up under the engine area. It wouldn't accelerate, especially uphill and ran rough. I had coil packs and spark plugs replaced as well as the air filter and fuel filter. My boyfriend had sprayed an entire can of carb cleaner on the mass air flow sensor before I took it to the shop. It ran decently for a couple of months and now it is idling rough and hesitating when accelerating. I wanted to replace the MAF sensor, but I thought the mechanic would have mentioned it and it ran fine after the coil pad and plugs were replaced. I keep thinking that's the problem. I also used heet twice when I filled up. Could that have clogged something up? It seems like it never was completely fixed.