The water trap (you are calling it the expansion tank??) is often a source of an air leak into the fuel system. The cheap plastic construction breaks down in cracks so that the fuel is getting air as the pump attempts to draw from the the fuel tank beyond. Bypass it with some neoprene hose, hose barbs and clamps. You will probably find that this is your problem zone. Besides, with the generally good quality of fuel here as well as the throw away fuel filter under the hood, you probably don't need the separator anyway.
Hey, what was your mpg when you go 55?