There are technical solutions without mass surveillance.But I am not optimistic enough to believe those will be demanded.
Specifically because of the lack of surveillance, and the lack of monopoly protection for big tech.
Pretty sure big tech lobbyists are making sure the worst approaches possible get put into law. Not because they are evil per se, but because it strengthens their monopolies.