keep in mind that mog (while a terrific service)streams at 256-320k, which is not quite CD quality; even if you were to markedly upgrade your gear you're going to be limited by the quality of your source material. that said, your setup seems fine; you might experiment with adding an external power amp or different speakers and see how you like it.