Something I've just thought of, weren't you talking about getting a PS3 before? It streams, stores and displays content (AVI, MP4 etc among them), plays BRs, and has a built-in browser that you can use a 'Tooth/Wireless keyboard and mouse with. It's also got iPlayer and Facebook functions in the firmware, if that matters...
I appreciate it's probably not ideal, but something to think about
