Another thing to remember about the ATV2 is that it must have an iTunes instance running on a computer to stream content unless you are playing content from the iTunes Store or Netflix/Youtube. It cannot mount a shared disk or use a NAS that runs the open source Firefly iTunes server application. Since your signature lists only a MBP, you might want to think this through unless you are looking for Netflix or iTunes store rentals only.
The Roku2 XS (1080p) is a great solution for internet content (Netflix, Amazon, Huluplus, Epix, HBOgo, etc) except the iTunes store of course.
The ATV2 is a very handy iTunes music player with the iOS Remote app, but be aware that it transcodes everything to 48k, so it is not a bit-perfect audiophile solution by a long shot.
If you don't need HD audio from blu-ray rips, a 2011 Mac Mini with XBMC is probably about as close to an all-in-one solution as you will presently get. A Mini running Win7 & JRiver Media Center is also good, but still no HD audio on the Mini.
I love the ATV2, but if I didn't purchase TV shows from the iTunes Store, I would likely not use it.