not sure on the design of the fuel pump setup however....only 1 or have 2 pumps? my quarrels involved a daily-driver (cis bosch-kjet volvo) and the pre-pump, failing and taking the main pump with it from starvation/overheat/cavitation. if youve got 2 pumps, are they both working?
(finally that car died and was able to get something else.)