Good technology can be developed to fight surveillance in a reasonably convenient way. With time, it can attract enough people to make a change. See: https://qubes-os.org.

In addition, turning surveillance against the government could also be beneficial: https://en.wikipedia.org/wiki/Sousveillance.