I was in pretty much the same position. Really liked the sound of Spotify/Apple Music and occasionally Tidal through my Wiiim Pro Plus, and while I did enjoy playing CDs on my Marantz CD6005, the Wiim had the edge.
Then fairly recently I upgraded to a SA8005 and the difference is substantial...