It may not be a waste to pull the injectors and have them tested. Badley messed up they might run much better at higher revs. Should be pretty cheap just to get them tested. The pump is so expensive it would be a shame to go there first although it is a possibility.