The tube pre will take the edge off the harsh thing that digital can bring...
I would like to make a suggestion for your your streaming entry( if you wish to go there)
Here is the gear.
Used Arcam Rblink Bluetooth ($75.00 usd)
An Ipad mini used if you wish. (Cheap)
Spotify music streaming. ($10.00 or so a month)
The secret cause here is the Ipad mini sound signature and I have proven it to others live in a Demo.
It images incredibly and the Bass out is perfect.
Your system will "Jam" with incredible musicality in every genre.
Don't chase details and resolution to the point of "skipping" tracks.
It is then a miserable hobby.
Cheers!