Glad you found something that works for you!
Another thing you might try (disclaimer, I haven't, but plan to) is XBMC running on an old laptop. It's a full featured media center, and connects to Pandora, Google Music, and a whole lot more. Couple that with the Android XBMC full-control remote...