There's one solution to the latter. Shut down the agencies. Then distribute whatever systems they've been working on so they can be defended against.
It'd be unpopular for some (imagine if a more liberal party actually shut down the NSA or GCHQ, and then open sourced everything), but it'd certainly make an impact.
The other important point is that since the 90s, the snoops have been getting steadily better in spite of crypto becoming more widely used. Or at least that's true of the NSA; in the Apple case, it seems to me that the FBI is saying that they suck at tradecraft. Whether or not that's true is a different question.