Maybe in 2028 a presidential candidate can run with removing the Patriot Act as one of their campaign points. I suspect the world will be very different then. The America I knew, remembered, and loved started dying with the passage of the Patriot Act.
I've worked on privacy regulation. This would not get votes. The unfortunate fact is that the people most passionate about these issues are also tremendously lazy or extremely nihilistic. (Maybe it comes with the territory of not trusting institutions.)
Either way, privacy advocates can rarely muster even a dozen calls to electeds, let alone credibly threaten backing a primary opponent. The reason SOPA/PIPA worked is it animated a group of tech advocates beyond those with ideological opposition to surveillance.