Mike, here's what I would do if I started over in my space with all I learned over the last few years and knowing the impact it had in my room (and in my opinion that's a huge variable for your new space)
Turntable - I have a Rega P8 at the $100k system I'd go for the Rega P10 or their new Rega Naia. I'd get the Rega Aura Phono stage. I'd go this route because it's a good value and hard for me to screw up. (PS: I'd also get an Audio Desk record cleaner)
Preamp/Amp I'd go tubes with ARC 6SE and 160S. I do prefer the simplicity of solid state so I'd be more likely to go with Moon's new 891 and 861. Note this would introduce digital to the system . (If that's a no go I'd go Boulder)
Speakers - I'd go for the Sonus Faber Amanti G5
I'd also spend money on Isolation (HRS SXR), interconnects I like Kimber Kable and have been impressed with Nordost) and power management with Shunyata.
The funds remaining would be on some room treatments and good glassware to drink beer and whiskey while I listen to tunes.