This is my main system (basement), changing slowly but will eventually get there. Next upgrade will probably be room treatments followed by replacing the 851N with a PS Audio DSD Jr. After those upgrades it will probably be time to experiment with different amps - class A and tube. Streaming Tidal and have barely listened to a CD in the last couple years. Will eventually need a NAS for streaming my CDs that are not in the Tidal library.
Also plan to knock the wall down to the right of the chair and make one room. Will then be able to move speakers 5 feet out from front wall but will lose 1 foot in width. I think that's a good tradeoff. Right now the speakers are 6.5 feet apart, center-to-center, and I sit about 7 to 8 feet back.