American autowire kit, rewire now or wait

[russellrox]

I have a 66 c20 longbox fleet that I am going to be shortening to a shortbox and converting to a half ton suspension with 79 chev front k member and steering. I am fixing some wiring issues at the moment that the previous owner had, a wire shorted out that goes from the starter to the firewall and back across inside the cab to the guage pod, then branches off to the firewall and back to the voltage regulator. The burnt wire melted a few of the wires inside the harness so I have the dash apart and repairing the issues. Should I rewire the truck with my new harness kit now and be done, or wait until I paint the truck, I am planning on painting the truck within the year, I don't plan on sandblasting the interior or the truck, just the outside but the cab will be coming off. Opinions on what I should do.