Wiring assistance needed for starter/wiper stalk
 

Ive come across two issues which I need to resolve with my Miata.

First: Ignition switch works when its in the mood. According to the FSM, I dont have continuity on pins 4 and 5 of the switch all the time, which is why the starter motor only turns over occasionally. According to this:
http://forum.miata.net/vb/attachment...1&d=1239234999
I should be able to attach B1 to ACC and IG1 with a switch and B2 to IG2 with a switch and a pushbutton between B2 and ST. I want to keep ACC and IG1 separate because I have things tied to the 12v from the radio outputs that I would like to keep separate. Thoughts?

Second: My wiper switch has developed a rather humorous quirk. It will randomly start washing the windshield by itself and wont stop until you thump on the switch. Since Im not planning on using the washers much anymore, I wanted to wire in a toggle for just the low and high functions. According to this diagram (p33):
http://neomiata.com/garage/Wiring%20...20Diagrams.pdf
I should be able to put the blue (12v) in the middle of a three way switch, and connect blu/wht to one side (low) and blu/red to the other side (high). Correct? Thoughts?

That would leave me with only the headlight stalk to eliminate, and I should be able to do a single toggle for the headlights and another three way toggle for the turn signals. If anyone has any suggestions here as well, Im all ears.