Digital upgrade: new disc player or better streamer?

For consideration:  

Contemplating an upgrade in my digital system.  Currently using a Bluesound Node 2i streamer as well as an Oppo 105 for CD's and SACD's.  I have a collection of about 800 CD's as well as about 50 SACD's.  My system use is approximately 25% digital, the rest of the time listening to one of two turntables.  In my experience, really good analog betters very good digital including the high priced units, hence my modest digital investment to this point.

However, I find that I do enjoy streaming, not only for convenience but also to discover new music.

So I've been contemplating either a new streamer, specifically a Lumin T2 or similar, to replace the Node 2i.  Alternatively, a Marantz K1 Ruby to replace the Oppo, allowing me to use the Node 2i into the Ruby DAC.  Both options cost around $4K.

Thoughts or other recommendations?

Thanks!