There is one important element I didn't remember about accessory drive fitment when going through this.
Where is the back of the fan in the vertical plane in relation to the water pump pulley snout?
Looking at Tessone's build, I notice the back of the fan is above the snout. So, before moving the engine back into the firewall, I should have bought the radiator package and tried it to see. Of course I could pretend I really cleverly planned this so a front runner would fit.
99, maybe this will save you some work on yours.