I'm not sure that this is the answer you want, but, I have replaced the whole keyboard assembly (keys, switches, small interface PCB) as a unit in the past.  I did this because I had no success cleaning or repairing the the individual key contacts.  I had another one whose interface PCB failed.  IIRC, Commodore sourced keyboards assemblies from several sources.  They don't necessarily have interchangable parts.