Oh, I have another question:
Do the diodes have to be backside of the board, i.e. not on the same side as the switches?
Reason is, I'm considering doing a first build without any case at all. I'd put the PCB on foamed rubber, distributing keypress forces to the underlying table.
Then the smaller SMD diodes would be better since thinner, if they have to be on the backside.