I've been contemplating a similar move for the last 12 months or so. Initially I was going to go with a Hifi Rose 150b, and while that might still be the long term solution, I didn't want to spend that amount of money this year. So after much listening I went with a Wiim Pro. Available at Amazon...