Throwing parts at a problem can quickly get expensive. Proper diagnosis might save you money in the long run.
I'll add another thing to check: the low-pressure (in-tank) fuel pump feeds the HPFP. It gets weaker as it ages and can starve the HPFP, which can in turn reduce rail pressure at the fuel injectors. Don't guess, check all the points in the system!
|