geekiegeek:trig42: If you have a library of stuff on a PC somewhere in your network, I would go the Amazon FireTV, and get Plex going as well.
Plex plus Netflix is all we use at home (I have an AppleTV and use Plex through the Samsung SmartHub on the TV).
Plex can also be used on an apple tv by hacking the trailers app.
I know, and before I got the Smart TV I used to do that.
Apple broke it at one point and it was a bit of a pain to fix (involved installing a certificate on the AppleTV IIRC). My Stepson uses Plex on his ATV2, and it works fine for him.