The only real long-term solution is to keep moving toward decentralization and encryption everywhere, making it close to impossible for anyone to conduct mass or targeted surveillance. Even if we assume the NSA (U.S. National Security Agency) follows orders, there are still 190+ other NSAs (Nation-State Actors) doing their own thing - not to mention the private and quasi private entities running the infrastructure. If someone can peep, someone will peep.