spdif/USB converter vs DAC upgrade

Right now I am not really using any computer based audio source. I do have my old laptop connected to my integrated amp using the headphones output. My laptop does not have a SP/dif output. This setup is only used during parties when people want to play you-tube/spotify stuff. However I am thinking about buying a NAS and use DBpoweramp to rip my CD collection. But then to get a half decent sound I need to use the USB output of the laptop. That means that I have more or less 2 options.
1) I buy a USB to SP/diff converter like Stello U3/SOTM dx-USB etc and maybe buy something like the ifi usb power. Then connect it to my Wadia 12.
2) Buy a new DAC something like the Schiit Gungnir/Metrum Octave mkII with a USB input.

Both options have their pros and cons. In the far future I might need to upgrade my DAC anyway for high ress audio. But for ripped CDs 16/44.1 is good enough. I am looking for something that is at least as good as my CEC TL51x Wadia 12 combo.

But maybe a cheaper solution like a Schitt Bitforst or the M2tech USB evo will be good enough. It would be great if the future streaming would sound a lot better when compared with my CEC transport. But I am not willing to spend lots of money to gain a slight improvement.