but I can't play the songs from my computer using my macbook pro, I have to use the Apple TV to select songs which is a major pain
You can output ALL sound from your MBP to the ATV. ALL SOUND, not video, sound. If you have a 2nd computer, you can use screen sharing. Like I've said. Option clicking the speaker icon!
http://osxdaily.com/2012/08/01/stream-all-mac-system-audio-over-airplay-os-x/