Thinning out old rats nest wiring is super satisfying.
Yeah, tell me about it...I went through the same thing with my '85 CC..
I could not believe how screwed up the tail light and trailer connector harness was on mine when I got it....and I did not have a wiring diagram...but I fingered it out...
I should have saved the old stuff and taken a picture of it...
One of the few things in my life that I did not see any other use for it other than vigorously and with much flair flinging it into the nearest trash can...I should have done some kind of ballet move with it...
I started with a pair of snips...under the truck and laying on a few sheets of cardboard...black soot everywhere...and bared the harness back to the point of it not being molested...and hesitated a second....no going back after the next act...and snipped that crap off and away...
You ever hear of a shark feeding frenzy...? I started snipping everywhere...all of that twenty and thirty year-old-stuff was going away from here...!!!
I took the best bit of a harness diagram I could find on the internet...the instuctions for a trailer wiring harness... the instructions for a modern RV connector plug and receptacle...with a 4-flat option...and the instructions for a trailer brake unit that I had on hand...and made up an extensive color-code-to-function chart and diagram...
....sorted out every bit of my wiring supplies and tools...organized it into bins and bags...made a few trips to the parts store and bought some stuff from Work...gathered up any marerials I might need...
...and attacked that job with the ferocity of a Guy that wants NO MORE TROUBLE with any wiring problem while out on the road and towing a heavy load....
It all turned out pretty good...crossed the 'T's' and dotted the 'I's'...
THAT was satisfying...
I hope it is as good for you as it was for me....
I can thank the job I had at a paving company for getting me militant about wiring...