Engine is a Volvo 5.0GIPEFS, year 2000, S/N 4012016326. There is a whine, now isolated to the fuel pump. Before paying attention to the whine I was troubleshooting loss of power when throttling up. I changed out the plugs and filter and found some water, but not a lot, in the old filter. The...