When I got hold of my unmodified pad, which very rarely come up for sale. I went off with it to try Carling switches, and other brands. I went to a few electronic, automotive and boat places, and even tried online. I came to the conclusion the only way to get it to fit was go was 2nd hand OEM. The reason I had gone non OEM in the first place 20+ years ago was the ridiculous new and used prices they wanted for switches. Used switches at the time were also very thin on the ground. This time around they were relatively easy and cheap to purchase. I also had the same issue with OEM 22 Lt top boxes $400.00 Au plus used when I first got my Brick. Last year I picked up two really good ones complete for $100 Au and $50.00 Au. Prices seem to be coming down on used Brick parts but patience is required.
Regards Martin.