Beno, Have a look at "BAILEYS DIESEL GROUP" they are now rebuilding the DENSO injectors (BLUE PRINTED INJECTORS) for the D4D toyota motor and now from what i heard the YD2.5 D40,they seem really good they give a 2YR warranty as opposed to 1YR you get with new ones and they have tighter tolerances on how they set the flow rate of the injector and match them in sets of 4 which means they can calibrate the ECU if you want to deliver more power like a chip.
THE BEST BIT IS THEY ARE $250 a pop as apposed to $800 and like i said come with double the warranty.
Ask the boys a t SELDOM SEEN they will know "BAILEYS DIESEL GROUP" they are at UNANDERRA.
Im sure they will do the pumps and Rails, but while you do both of them i would look at the injectors, especially at that price and warranty.