You could do that, or go full painless.
I'm cleaning up mine, and it's definitely not painless. Do what your budget allows. If you're going for full out racecar, get a universal painless wiring setup. If you plan on running it on the street, keep the factory stuff, and cut out what's...