I'm personally for #1. Lets stop kidding ourselves that the TV is ever going to be good at content. Give me a good screen with an HDMI in and I'll handle producing the content for it.
Personally, I'm semi-excited about the idea of a Windows 8 transformer tablet (similar to the other asus transformers) running on an ivy bridge CPU. It could be a solid daily driver when paired with a remotely accessable desktop for the heavy lifting.
That said, a windows 7 tablet running an atom CPU with no keyboard is rediculious. It's not a computer and it's not a tablet. It's a still-born bastard.
Ultimately though, I'm not convinced that an iPad plus a solid Windows 8 ivy bridge laptop next year won't be the best of all worlds.
He has not acquired a fortune; the fortune has acquired him. -- Bion