Considering an upgrade

I've currently got a small Windows PC dedicated as a Roon server, with a Bryston BDP-2  streamer feeding an Yggdrasil DAC (gen2). I play everything through Roon - probably 60% Tidal, 40% locally stored content. There isn't anything in particular that I'm unhappy with, but I'm wondering what options I might have without spending too much more (maybe $4K to $5K more) than I could sell the streamer and/or DAC for.  

I listen mostly to female vocals (classic rock, folk, alternative), jazz, electronic. I probably value vocal smoothness, naturalness and clarity above all else, but I wouldn't want to give up much if anything that my system does well now. 

I'm curious about something like the W4S Music Server which would replace both the PC and streamer, or using a DAC with a built in streamer such as the PS Audio Direct Stream. But I'd also consider just doing a DAC upgrade if there is something in the $4-$6K range that is a significant upgrade over the Yggy. I'd consider new or used.

Also wondering about upgrading my Bryston BDP-2 to a BDP-3. Not sure what kind of SQ improvements I'd see.

Thanks,
Jay