I have the injectors out, they tested well. As for the rebuild, I have it in the shop now, and they are having trouble locating a pump head and rotor, as it is discontinued. If they find the parts they are quoting me $800 to $1200. Without the right parts we are considering using a four port head instead of a two port head, blocking two ports, and using the twin cam instead of the quad cam. It's a "stab in the dark", and may not work, but we haven't ruled anything out yet.