I've been talking to my local rep and I'm looking into a bulk order of the EAO switches from the manufacturer (these will be discontinued in a few months so its now or never). They're sending me some samples so I can compare.
They are pricey though, I'm torn between buying these switches (the easy, expensive way) and having reproductions of the Cherry holders made (the tricky, more authentic, maybe even a little more expensive way).