To be honest with you, without changing the harness, you are going to continue to have problems and if the right wires happen to short, you can do some expensive damage to the modules and controls...so a harnes is where you should be going before anything.........

__________________
A Dalton