How about we just ban government and government contractors from owning, possession, or use of surveillance tech. This on top of acquisition of data from any such systems so they can't get around the law on a technicality. Then lets make it possible for the public to enforce it through the civil courts where companies, law enforcements, and government employees involved in violation of the law can all be held jointly civilly liable by any member of the public. It seems like it would be a lot easier. Then the EFF, ACLU, and others can have a field day with going after the perpetrators of the crime.