Diesel Injection Pump Rebuilders in USA?

[Navcruiser]

I posted this message last night and it never appeared, so I'll try again. Sorry if it comes up twice. I have an original 2H in my HJ-60. I see these pumps and 24v alternators being offered on ebay from Australia, but I recently got BURNED when after I had won the bid on a fuel sender the freight charge was as much as the part.

Is there a good quality injection pump rebuilder in the USA that will have Toyota parts and understand our needs on these old cruisers? I have diesel pumps rebuilt from time to time on my farm equipment, but my rebuilder doesn't know specs on 2H and doesn't have parts.

Don't need one now, but I like to plan ahead.

Thanks, Navcruiser

Ps: It would be nice to know a rebuild shop for the 24 v alternator as well.