I say replace the electrical ignition switch and see what happens first.
It is a cheap part to replace: $5.99 at ebay.
I recently replaced mine and I replaced the evil set screws with something longer.
http://986forum.com/forums/general-discussions/51181-ignition-switch-holding-screws.html