Additional info about your current system beyond what you have posted in your virtual systems would be helpful. You can see my systems under my ID.
In general, you have great opportunity for a step up with both the DAC function and the streamer function. I am also a big advocate of separates. The flexibility to upgrade is an important one. As Bliss recommended an Aurender would be a great choice. I would recommend an N200 and a good DAC. Ayre makes great DACs. I have the combination on my headphone system. Maybe a used Ayre DAC and a new N200.
Today there is nearly unlimited potential in improved sound with better streamers.