Sounds like you've got a "Frankentruck" there! I really love straightening out other folks' wiring mistakes before I start making some of my own! If you're going back original, or close to it, find an original wiring diagram and try to follow it as closely as possible, eliminatind extra wiring as you go.
Jerry

"It is better to be silent and be thought a fool than to speak and eliminate all doubt!" - Abraham Lincoln
Cringe and wail in fear, Eloi- - - - -we Morlocks are on the hunt!
There is nothing noble in being superior to your fellow man; true nobility is being superior to your former self. - Ernest Hemingway
Love your enemies and drive 'em nuts!