I hope you're right. The obvious counterpoint is that off-the-shelf crypto has been available for 20 years, and effectively nobody uses it. Also, the government has a significant ace in the hole: they get to send in men with guns to tap corporate pipelines and issue gag orders. More home computing power isn't going to fix that.
I'm still optimistic in the long term. It's just a shame we've forgotten the lessons of history, and won't take action until there's real abuse, instead of being a smart enough culture to nip the problem in the bud.