There is no way to have both. Surveillance is power and it corrupts in the same way as any other form of power. It's not just about patching some individual holes. You can't have too much of it for the same reason why you can't have a cop stationed at every single building in your city. For sure, doing that would make some people feel safer, but it would also make anyone doing something legal but disfavored by their government terrified, increase prosecutions for frivolous infractions and open the door for a future government to swoop in and make great use of all that free power lying around.

Besides, even if it was possible to do both (it's not), do you think this would ever actually happen? When it comes to surveillance, they only take and take and take and never give anything back, further encouraged by a terrified populace that wants more safety in a safer-than-ever world. It's a ratchet that only goes one way because it greatly benefits anyone vying for power in governments and businesses alike. Once you let them have it, you're not getting anything back.