FYI, if you're going to be doing a lot of rewiring, be sure to get a
good set of ratcheting double crimpers and use good nylon insulated
terminals. I get all my stuff from this place:
http://www.terminaltown.com/ and all their stuff is great. They even
have Mil-spec if you really want to go the extra mile. If you have a
wet area, they have some prefilled with dielectric silicone and shrink
tubing.