Cat 3406 B fuel issue, idles fine, but cuts out with higher RPM's

Driving at 65 mph truck started puttering then it stalled. I tried re starting and it wouldn't so I pulled fuel filter off put fresh conditioner in it and it started right up and I completed my night. The next night it ran ok for a few hours then started puttering again but it didn't stall. I even shut it off to pull filter and dump it out and refill again. Truck started but still puttered all the way back. I was thinking water in the fuel. Put a few bottles of fuel power in it and changed filter again. Started Monday night and made it 20 minutes out of terminal. Truck shut off and would not re start even after changing filter AGAIN. Shop nearby DRAINED both tanks and found water in fuel, new filter and conditioner. Picked it up today took it to top off fuel tanks, put more conditioner in and low and behold, still doing it....bobtailing. When I made it back to terminal, thank god with out a tow, I revved engine and pushed RPM's and then it cut out, then came back a few times so it does it standing still. I am at a loss....AIR in fuel ? Fuel transfer pump ? it sounds great a normal idle.
ANYONE have any thoughts ?