If you swapped all the diodes, presumably you made sure no metal switch tabs were too close to any other metal object? If so, you may need to look for pinched wires somewhere that may be causing the short instead.
New! Dark mode!
Browsing Pinside at night? Getting tired of all the white? Switch to dark mode using the button in the top right (or CTRL-B)!