I've gone out with wire cutters and my multi-meter several times to start tracing and cutting the dashboard wiring. Every single time I chicken out. It's just SUCH a mess back there.
I admire your courage, but if it currently works, I'd leave it as is. Your dashboard looks great and if you're not planning on a completely new dash (doesn't sound like it) I just don't see much benefit.
Your batteries, however, need a new system. I've used the BlueSea Add-A-Battery system in my boat and a couple of friends boats and I like it a lot. It has a perko-style switch that has ON-OFF-ALL. The isolator makes sure that the starting battery gets charged before it kicks over to the "house" batteries. If you have a charging/battery problem, you can flip over to the ALL position and still start the boat. It's never failed me and I haven't been stranded due to dead batteries since I installed that system and an on-board charger.
Former owner of a 1987 Supra Saltare. Current owner of a Malibu 23LSV.