The only way to solve the problem would be to elect politicians who would either dismantle most of the surveillance system or address crime and terrorism so decisively that there was no longer any plausible threat to justify continuing to maintain a mass surveillance apparatus in which case it would (hopefully) eventually wither away as part of budget cuts once politicians forget why it was even "necessary" in the first place. There is no solution to political problems without obtaining and using political power to solve them.
The strategy of eliminating the system's justification isn't foolproof though because the bureaucracy that runs the military draft (Selective Service) somehow still exists even though the draft was ended around half a century ago and is almost certainly never coming back. Politicians only noticed it existed a few years ago long enough to debate whether to extend the wrong of registration for it to include women in addition to men. The eventual decision was to leave the status quo intact[3]. The sensible option of abolishing that relic of a past rights violation rather than continuing to waste money on maintaining the bureaucracy was not seriously considered. That means the direct route is almost certainly the better approach.
[0]: https://www.theregister.com/2022/08/10/github_tornado_cookie...
[1]: https://en.wikipedia.org/wiki/Silk_Road_(marketplace)
[2]: https://www.reddit.com/r/TOR/comments/rjgq8s/ok_so_what_has_...
[3]: https://www.politico.com/news/2021/12/06/ndaa-women-draft-dr...
Monero is still going on strong, as far as I know.