I've also looked for other switches which would replace the whole thing, this comes closest:
but just a tad to big and the wrong footprint. If there's a widely available switch which has a 4pin 5mm footprint I could adapt the 3D design to match that switch.