I may just bring it to the place you used since they have done one before. It may be memorable since they had to redo it.Chris,
One suggestion with the radiator repair shop path, have them take pictures before they start. When they rebuilt the radiator for the '86 BJ70, they confused themselves on reassembly by referring to FJ60 radiator pictures which were the only pictures in their catalog. This was easily corrected because I was able to walk them through it, but it meant rework (extra for them and delay in getting my radiator back for installation). But is was avoidable.
Good luck welcome back to the neighborhood.