New Wiring

I've been messing around with my CJ wiring for weeks. First I used all the existing PO wiring mess and got everything working. But I couldn't stand how messy it looked, so being the genius I thought I was I installed a couple of fuse blocks and started rewiring.
My first mistake was not just taking the dash off and wiring it nice and neat at my bench instead of trying to reach under from a prone position.
Then I grounded a wire I shouldn't have and killed something vital. Finally got the motor running again but that and the horn were about all.
SO....I just gave up and ordered a Painless Wiring Harness kit. $299.
Heck my medical bills are going to be more than that if i keep going.
I ordered new Headlight switch, Windsheild switch, and already have all new Speedo cluster, oil presure, voltage, and temp.
Next step is to pull the dash and take it to a metal fab shop close by and have them make me a new aluminum dash leaving a hole in the middle for a gauge cover from 4 Wheel Hardware.
Any good advice out there on anything I'm missing?