Parts - light switch, door lock barrel

[dezelsky]

Looking for some pointers for replacement parts for my 411 S4 which are not on the cross-reference list:

Headlight rocker switch - the casing of the original is broken and various repairs are not holding up. I sourced an MGB switch which looked the same from it's picture but turned out to be narrower. Is there a direct replacement available?

Door lock barrels - the locks are very worn, esp on the drivers door, any narrow metal implement will unlock it. Are replacement barrels available?

Any hints appreciated