My family has a long history with a diesel business in North Dakota. They rebuild pumps for all the major implement dealers in the area. He rebuilt my pump after another local (to me) shop did a poor rebuild on it. After that experience he is worth the extra time for me to send stuff back and forth. He has good service and is very knowledgable.
I'm just throwing out another option that someone has actual good experience with. This would be stock parts.
It will cost a little more, but I would have whatever you buy pop tested and shimmed accordingly first.
Don's Diesel Injection Service Inc. 701-352-3209