Yes, very good job on finding the prior hackery.
It sounds like you know what you're looking at, and that you know what you're doing. You already know to use proper gauge wire for the repair; good!
New resistor blocks, and even a new pigtail connector for it, are available and relatively inexpensive (at least, the last time I looked). That connector on it is bad about being heat-damaged after years of use; if it looks melty or brown, may want to look at replacing it.
Great job; you've got things well under control.
P.S.- Where's my manners? Welcome to TRS!