A third party needs to spring-up that will address privacy -- that's where both companies blew it.
I can deal with a few product problems, because they'll improve over time. I'm dating myself, but I remember the first version of Windows and it was God-aweful. Windows 3.0 was the first real version of Windows and that sucked horribly.
Our government had a wonderful tool for stopping crime -- the Internet and ISPs in particular. But instead of using this new tool in a constitutional way, they decided to confiscate everyone's records and let God sort it out. So now, we'll need capitalism to save us. I use a VPN now for my Internet (this post should show as originating from somewhere else). Ultimately I'd like to find a technology that would change my IP on every single Internet access.
So my vote? Potato.