Honestly, at this point I'm just waiting for the internet to implode so we can start something better. No more signing 'petitions' for me, which go straight to whatever senator's trash.
Or we could work to make sure that traffic is always encrypted. Solving the ISP knowing who your packets are going to is more difficult, but no longer having clear data passing back and forth should have been a solved problem by now.