Forgot to mention, moved the GEN light wires and 4WD wire to the water temp and seatbelt light circuits, by changing their position in the plug that goes into the circuit board. I used the original plastic that was over each by trimming them and taping them to the other half of the ones where I put them. It seems to work and looks factory. Kinda slick if it works right. I wonder if the gen lights wont drain the batteries or not work right as I spliced them together and left the gen 2 relay wire where it was.
I hope their isn't any short, and that it's the light switch that caused all the ills. Yesterday it gave a big flash and out went the dash lights, only at the time I didn't know it was the switch that shorted.
At least if I have to take the dash out yet again, it'll give me a chance to loose all the crimp splices and solder and shrink tube the connections instead.