I did a conversion from hydraulic to an electric brakelight switch. Any 1980s or 1990s Volvo 700 series switch does the job perfectly. I made a bracket to mount it behind the brake pedal and used the original wiring pulled back through the firewall. No modifying other crimping on new connectors.
I can make some pictures of it if you need them.
Chiel