oatboy, i would problably do the pump. if you do have it done be sure and have the gov drive couplers replaced and install a new gov spring kit. your pump repair station may not know about this but the spring kit is avlailabe through your agco dealer. this is a good time to do this as it will need to be done sometime.if you have the pump off, timing is very critical. if you are not familar with the procedure have someone do this part for you. and last but not least run an overhead. this is critical also. needs to be done on a 24 hours cold engine..........As for the injectors; if the injectors are not stuck hard in the head you can do it without the special tools......if they are you will need a puller....does not have to be the deutz puller only one that will have same threads as your injectors. i often use the one out of the cummins service kit. they are like any other injector from there. remember that there are not good used tips.be sure whoever does them laps all mating surfaces and replaced pins. clean holes in heads well and put neversieze on them when you install them. torque on them is important also..........good luck