The Bluesound Node 2i would be an obvious upgrade but I totally agree that you should move to lossless streaming first.
The Connect sounds pretty good via it's optical output into an external dac on it's own.
The Connect sounds pretty good via it's optical output into an external dac on it's own.