Still not enough. What you suggest does not prevent the government of possessing the data. Technical means of collection needs to be preemptively banned.