so after getting a few tips from Matty and others I did a complete rewire. All of my 20 year old toggles and glass fuse holders were falling apart, the old ground block was corroded and a lot of the screws wouldn't turn anymore, some wires were bad and a lot of wire had been pulled and abandoned over the years by previous owners. Used only high quality components and of course tinned marine wire. Pulled almost 100 ft of positive and 100 ft of ground wire. For anyone wanting to do this it wasn't that hard but did take me most of a weekend (including a couple of trips to get more stuff).