Where to take system from here?

Fellow members.  Need some advice on what to do to get the greatest improvement in my system. I have been largely out of this hobby for the past 3 years.  Looking to get back into it and want some recommendations on where to go from here. My room is 19*14 feet with 10 foot ceilings. I like all kinds fo music except heavy metal and rap. My largest preference is for female vocalist, acoustic/electric guitar.    My current system is:

PS AudioDirectStream DAC/Bridge2 - connected to MacMini music server running AmazonHD Audio and JRivers - had 5 years
Thiel 7.2 Speakers - had since 2007 - Had Thiel 6's prior to that
Lamm M1.2 Monoblocks - had 6 years
Kimber Select 3038 Speaker Cables 
Kimber select 1132 Interconnect

My prior system I was running Krell 350MCX monoblocks into a Krell KCT Preamp into my Thiel 7.2s for 10 years.  My system was in my basement which was a very large room (70*28) and handled the Krells into the 7.2s well.  I was using a Sony SCD-1 that was fully modded by Richard Kern, which was a huge upgrade over the standard player.  I wanted more warmth and less bass/slam when I moved to my smaller current room and the Lamm's gave me that.  I considered moving speakers at this time but never got around to it.   I still have the Sony  SCD-1 Player but have not used it in 5 years. I have never connected it to the PS Audio DAC.   Where do I go from here?  What parts of my system would you consider upgrading/what adjustments would you make?  I have considered going to Wilson speakers with the Lamm's, which I believe are a marriage made in heaven. I auditioned multiple B&W's about 5 years ago when I got the Lamm's and did not hear a significant enough upgrade from my Thiels to justify the switch at the time.    Do I keep the Sony SCD-1 or sell it. Will i get any improvement going from the Sony SCD-1 into the PS Audio device. Do I go back to CD's and upgrade my source?   Is digital fully the way to go now, realizing many still have a preference for vinyl.  I do think the PSD Audio DAC is an awesome product.  Given my music preference is it time for tubes?  Appreciate the help.