I've considered replacing the rivets with screws, and I still may, but
it will only fix one of the shoddy construction issues with this
switch.

I'm off to check Ebay next (good idea, I hadn't considered it)

If all else fails, maybe I'll try some high quality toggle switches...

Dean