I have a 99 Standard that I've owned for 9 years. The kill switch stuck 'off' about 2 years ago, but a little WD40 fixed it. . . until now. Oil worked again tonight, out on the road, but it's time I fixed it right before I get 'stucked' somewhere. The job looks fairly straight forward. Is there any aftermarket ones that are better that the OEM? Any tips on making the job stress free?

Thanks