I'll swear by United Diesel (link) in Springfield, VA. (No affiliation, but it's the kind of place I'd wanna work)
They don't do engine rebuilds per se (I've asked - haha!), but getting injection timing right, rebuilding injectors and injection pumps... pros.
I've been in there four or five...