I saw the title of the thread and got all excited to come share my knowledge. Someone beat me to it!
I used the Bosch ignition switch from Sierra Madre with the more period correct bezel. You'll need the fancy C shaped wrench to tighten the bezel. I was pretty happy with the upgrade, plus it gave me an extra key in the process.