Thanks Bob,
That's which way I am going. I have already purchased the switch from finishline, and will self-park the wipers. The switch came with the wiring diagram, so that's done. Now I just need to get rid of the wire nuts.
On another note, I do believe the harness has been upgraded in the past, as it seems to match chassis 6xx on the diagrams, not the early ones. I have gone through the front harness, and once the dash is complete (soon), I will go through the rear harness.
Thanks again,
Jim