I used a ton of solder, but I absolutely do not want to deal with this issue again to the extent I can avoid it. Just did the garden hose test, and it's holding a good seal.
Thanks, btw, for sharing that thread. I also need to replace all that old foam in the heater box and in the ventilation...