Best set-up under $20K

I agree with upgrading the streaming end of things.  One thing to put out there--I recently purchased a Bluesound Node X and have been extremely happy with it in my heritage McIntosh system (2125 amp, C28 pre amp, Mc XR 5 speakers).  It is a more resolving DAC than the last generation Node.  See a couple of Steve Huff reviews on the node X.  A final thought would be that after carrying this Mac system to different homes over 40 years, is how crucial is the room itself and speaker placement. The sound is far superior in my current room with my older Mac speakers pulled out from the wall, than/ earlier smaller rooms with speakers in the corners.  I prefer the sound in my current room/system to much higher end speakers (Wilson Sabrina, Sonus Faber Nova III)  in the dealer showrooms.   Have fun....