Well, if the wiring harness is that rough you might be better off either replacing it or rewiring the bike yourself. I've wired bikes from scratch and it's not too difficult if you break things down and stay organized. It can take a bit, but it's sometimes better than trying to fix someone else's mistakes.