On my XLV, I don't have all of that. I go from the fuel tank, to an INLINE fuel filter via rubber hose. Then the rubber hose leaves the inline filter and goes to the LP pump. Then the rubber hose goes from the LP pump to the inlet of the HP pump, and IIRC, there's hard line from the HP pump's outlet to the fuel rail and beyond.

So maybe just get an inline filter and bypass the whole "fuel/water separator" that doesn't exist in newer boats.