I will be doing the same - with modifications - this winter.
I replaced the engine harness wiring a couple of years ago. It was easy to do and it got rid of many damaged/repaired wires and worn connectors. Well worth the money.
Check out
http://www.madelectrical.com/index.shtml if you feel like improving some of the stock wiring.