I got the new 2-blade repro fan. Ironically, it had the same problem as the old fan I had originally planned to use: it would not go far enough down on the tapered water pump shaft for the nut to fully screw on. So I put the nut in my lathe and made it a bit shorter. I also had to take my angle grinder and grind down the front of the water pump casting so that the fan pulley would not rub on it. But after all that was done, the fan worked fine.
Since I had the radiator off the car, I repaired the top mounting bracket, where a piece of it had cracked off. I had to weld on a bit of metal about a half inch on a side and grind it down to match the rest of the bracket. Then I re-installed the radiator and put the newly-painted shell on over it, and now the front of the car looks quite handsome.
I packed up and put away my painting tent- I won’t be doing any more painting until next spring. The next step is to work on getting the new repro fender I bought to fit properly. It will need some metal work in a few places to get it to line up properly with the car.