Personally, I think capitalism is a pretty good solution to that one. Boycott them, put them out of business, let them serve as a warning to the next bunch of people who consider screwing over the customers under the counter.
We've known that Microsoft has provided back doors for decades and privacy conscious geeks already boycott them but their software is still everywhere.
The NSA scandal in the eyes of the general public is just a joke. "Haha, the NSA knows everything. OK, now what's on TV tonight."
Geeks who care about privacy don't have the numbers to vote with their dollars.