We did it that way. Yes, we took all the electrical out before paint. Much easier the second time around with the electrical, but at least we drove it for 2 years with no electrical problems. I can't tell you how many things we did twice, I guess that is all part of the restoration process. Frank