One more idea for you that I forgot to mention. You may want to look into either Zoethecus amp stands, or perhaps Silent Running Audio, or Neuance platforms depending upon your budget. I mention this as tube gear at that level of price & performance on a metal and glass (what it looked like) shelf system will be subject to quite a bit of vibration. Removing as much of that and microphonics from the tubes will yield very worthwhile improvements. Just some more food for thought. Good luck!
Wow- extremely nice start (and end) for speakers and amps! I am sure those could make most happy for many, many years to come. Perhaps a Audio Aero Capitole Mk II SE cd player that you can run direct to your amps would take care of upgrading both the preamp and cd player. The Capitole Mk II will also keep the "analog" sound of the Rega Planet, however add in liquidity, detail, space, soundstage, etc.