I'd prefer to maintain C&C types. Problem is, many of the replacement spindles are getting unobtainable. There seems to be only a couple sizes that are readily still obtainable.
Loose Screws has cup sets
http://www.loosescrews.com/index.cgi...d=412331318174
and spindles
http://www.loosescrews.com/index.cgi...d=412331318174
still available, but depending on what you need, you may be getting into cartridge prices.