^ X2.
i used witch hunter to rebuild mine when i rebuilt my engine. I sent them the four injectors and the cold start injector.
They cleaned and balanced them all to within 2% of each other. they replaced all of the worn rubber /plastic pieces and even sent me the old parts back.
Great company. would do it again in a heartbeat.
Additionally, since the whole motor is torn down I would look at getting either the radiator cored and cleaned or just getting a new radiator. (if you decide to go the new route and cant afford OEM, i would strongly lean to cleaning the old OEM one way before putting in a new aftermarket one. quality of most aftermarket ones are **** and they don't use the same brass / copper construction as OEM usually)
Also make sure you flush all of the old coolant out of the heater core and replace it all with "toyota red" coolant in a 50/50 mix with distilled water. The coolant is specifically designed to work with the copper /brass radiator and aluminum heads to not cause corrosion over long periods of time. And the distilled water wont have any of the calcium that standard city water will.
Additionally, accidentally mixing said coolant with the green or yellow stuff can cause a sludgey nasty mess which no one wants in their new engine.
Finally, I would recommend using the OEM radiator hoses as well. First off, they don't cost that much more. Secondly, the OEM hoses have a specifically designed amount of carbon embedded in them to aid in preventing electrolysis in the radiator. (it kind of acts like a ground wire of sorts). anyway, aftermarket hose makers usually get around the high cost of OEM parts by reducing the amount of carbon in the hose, hence isolating the radiator from a proper ground, which makes electrolysis a lot more prominent.
as you can tell, i stumbled across a lot of useful / interesting information when rebuilding my cooling system. I think I have a couple articles saved on my computer somewhere if you are interested in reading them. maybe i can find them.
.....just my $.02.