Just ordered a whole bunch of new wire (and some new connectors) from Rhode Island wire (
https://www.riwire.com/) - they seem to have the proper stuff in stock. The plan is to splice the new wire into the old harness under the footwell (where the wiring seems to be okay). With some careful soldering and some time spent on my stomach doing this (and breathing flux fumes), this should work well. I thought about using some type of bullet connector like they use on the 911s, but that would be less original than what's in there now. Again, trying to keep as much original stuff as humanly possible, while actually making it reliable (well, relatively).
-Wayne