Do you really think that that is going to be the long term solution? Think about an average consumer - will you expect him to log in through tor or do not register with Google/Yahoo since they require your name/phone number. Secondly it is more than just PII (the govt already has those if you are in US) - I view this more along the lines that govt is now getting more context around EACH individual. And a lot of that is personal. All your email info, your files on Dropbox, your chats, your videos are readily accessible to them.

The long term solution has to be institutional. EFF is committed to help out there. I am not saying that EFF is the only solution (or even the best solution). But, at this point, unfortunately I feel there are few other options.