After 4 months of waiting, the pre-production samples of the switches came from the factory! Yay! They look exactly as I had intended, so that is a relief. Having to change the mold is an expensive thing to do. Now, all that's left is to ensure they are produced in the right colours - as is obvious from the picture, these samples are in black.

Now, back to making a CAD design that works for the case...