The late model harness (97+) is different due to the layout of the lights changing - unless you like playing with electronics, retrofitting that harness is probably not for you.
My 96 has the same problem to some degree, but right now it just looks gross and still works. I expect to send it to the scrapper before that part actually breaks, so I'm ignoring the problem...
I have not determined what make/series the connector for the headlight harness on the old body style (96 down) is, but I know that FCI's 2.8mm automotive connector series is used on the new style, and is a much superior connector. You could easily pick up the two connector housings you need (male and female) and the crimp pins and set it up yourself, or you could go to the junkyard and salvage the connector with about 6" of harness on either side for ~10 bucks, or just get a new 96-down wiring harness with connector and splice it in. Any of these methods would work and still leave you able to unplug the harness... it's really up to you how to do it. Hell, you could even use butt splice crimp terminals and just eliminate the connector entirely, but you will probably curse that decision later on if you ever have to pull the header panel.