Digital Gear & Upgrade Question, What do I need?

Calling all Digital Gurus,

I currently have my library on a NAS drive connected to my network (all wired). It is feeding 2 systems into a PSA DSD and I access and control using various windows computers running JRiver. The SQ has been more than acceptable but I am sure it could be improved.

I have a third system at my work office, there I am also running JRiver but library is on a 1TB SSD drive and sent via BT. Again, works well enough but SQ could use improvement. I have been considering upgrading that system with a PSA DSD Jr and running through work network.

Now, perhaps it makes sense to upgrade my main system with better gear, so my questions are:

A- What gear is required (DAC, Music Server, whatever)

B- Recommendations

Would switching from JRiver to some software be worth it?

At work, I stream internet radio through the computer via BT receiver to pre. If I upgrade main system the PSA DSD (newer) would go to second system and unit that is there would to go work.

Budget is fairly open up to 10k but biggest bang for the buck is a plus

Rest of system is:

ARC 5se

Pass 260.8

Magnum Dynalab MD 809T

Shahinian Acoustics Hawks

SteveA