fundementally we need to rethink what rights there are in public. We could start with "make photography totally illegal in public, or rewrite what we mean 'expectation of privacy' or what rules we have because the technology demands this.
It’s possible to allow small systems like home/business security cameras while forbidding mass surveillance. The law just needs to include clear statements of intent, and sufficient penalties, so future judges can apply it forcefully against people who try to find clever workarounds.
I'd also love to move past the inevitable "you have no expectation of privacy whatsoever in public!" comments that get regurgitated every time this topic comes up. Yes, that's the issue in the first place.