[HawgRyder]

In a case like yours...I would just rip out anything going to the engine and start from scratch.
It is not as difficult as it sounds.
You need ignition, fuel pump, heat sensors, oil sender data, starter activation, and maybe a couple of others.
All in all...perhaps 10 wires or there abouts.
It would look a lot cleaner, and you can colour code to your preference (just make sure to diagram for future).
Good luck.
Bob