Great, thanks! The explanation of the switch operation in the video reassures me that this is the right part.
I wonder if the switch itself can be fixed. The arcing noise may be due to bad contact from an accumulation of carbon deposits or oxidation. I'm not sure if the switch can be opened (without destroying it). If accessable, I might be able to give the contacts a light sanding.