Hey, if you think it was water in your fuel I would try some dry gas. I know its painful on the car but cheaper gas, Cough shell, or a station that don't sell alot of fuel allows condinsation to build on the bottom of the tanks. The other day my dads station here had 44 gallons out of 1,200 of water pumped out, and he had just gotten that tank refiled a few days ago, so imagen fuel sitting there longer then a week with eather a leak or condination building up.
As for O2 sensors and such. My ex has a damaged o2 sensor and a trotle body sensor going in it and it runs fine, only 30mpg but still no hicups m8!