Updated pictures in the post here!
You can get an aftermarket housing switches from a Lexus 470 and swap over your pcb into the new housing. You may need to slightly sand down a plastic stem on the bottom of the black housing so that the pcb can slide over. The aftermarket button membrane should work but you can swap in your old one if you need too
the quality of the plastic is actually pretty good!