upgrade what

Ditto!  

Given you have addressed acoustic issues with your room, the only logical thing is going to a different speaker.  That is the elephant in your music room!

I am always amused how some will do anything BUT replacing a bright speaker.  New DAC's, cables, tubes are not going to change this to a significant degree. System building always starts with a speaker you love.  And I mean 100% love.  Then pick the gears that will further complement the qualities you are looking for in your system.  If you you are making roast beef, seasoning is not going to turn it into roast pork!  Start with what really makes you happy--with no reservations.

Adding felt tweeter rings are easy to try.  Or you can experiment by treating various places along the speaker baffle.  Simple, cheap, adjustable, reversible.  Spica and Vandersteen have used that approach.

I’m guessing room acoustics, too. I pretty sure that’s what keeps my stuff from sounding better.

Upgrade your digital to a dac and streamer , you can rip your CDs to Flac files 

your cdp is a big part of the problem , your speakers too a bit bright changing the tubes to vintage nos , something warmer , there are custom grade  tubes  out there , one change at a time.

if you’re looking to upgrade, given the room is treated, look into ATC SCM40 passive speakers. Focals are not bad (I have Aria 906 mostly for movies) but the ATC will smoke them.