I'd actually be quite happy if there was a permanent oversight committee containing members of either or both of the EFF/ACLU, with the exception that they're n

I'd actually be quite happy if there was a permanent oversight committee containing members of either or both of the EFF/ACLU, with the exception that they're not allowed to leak programs, but are allowed to call for an independent Special Prosecutor to investigate abuses at any time. In fact I think the government could do a better job in general with liaising with non-profit NGOs.