You're wrong on two counts.
1.) It's American foreign policy that created anti-american Islamic extremism. It's American foreign policy that must fix it. You cannot expect tech to fix the problems of that. Technologies are tools, nothing more. Terrorists and tax payers are technology users alike, and that will always be the case. (Sidenote: anyone who is intelligent should hate the word 'terrorism', it is blatantly doublespeak.)
2.) These spy tools are going to die, because we can make technology that makes them infeasible. Indeed, we already have. Tor is reportedly unstoppable by the NSA. GPG exists and falls under the same category. The way things are headed, the only thing that will change with time is that tech companies will embrace encryption and help the general population of innocents to stop being tracked.
Those that care enough (eg: terrorists, libertarians, anarchists, and nerds) have already taken back their freedom... And will continue to do so. And there's nothing those 3 letter agencies can do to prevent it, because they've shown their hand. Anyone who has taken a cryptography class / a theory class knows that it's an unwinnable battle to try to fight RSA... It's just a matter of time before someone persuasive enough gets the message through to policy makers.