get a can of bio and run the pump straight off it. if she runs/sounds good, then it's obviously the water separator, or the in tank screen etc.
How much are you paying for glow plugs?