"What will it take to end mass surveillance?"
This is the wrong question, the right question is how long will it take before we stop caring? Privacy on the internet is an illusion (probably perpetrated by people wanting to sell security). With the right justification, any form of communication is subject to monitoring, but you are probably safer sending a letter through the post office than an e-mail, simply because of the legal hurdles involved in interfering with the interactions between two government agencies US Postal service and the NSA. I think the notion of internet privacy contradicts the idea of free an open information. Sure I want to read the entire content of the Library of Congress, but I don't want anyone to know that I did? I consider the internet in the same way I consider the other side of my front door, anything that happens out there is happening in public, regardless of how I try to disguise it. People will eventually come to the same conclusion and simply stop caring whose looking at them when they walk out the front door.