What do I need for a proper under-dash rewire?

Just remember when you buy a wiring harness it doesn't jump out of the package under your dash. You're going to have to take it all out and disconnect every last one and reconnect a foreign one in there. Much easier and much cheaper to repair what you have, your taken it out anyways....