This is exactly what we need. The only problem is that you left windows for blocking a judge from reviewing the evidence. There needs to be an explicit statement in the law that NO secret information relating to the case is beyond the authority of the judge.

The judge MUST be allowed to review the evidence and make a ruling. What you proposed will limit the ability of the government to abuse the state secrets privilege, but as long as it is possible to hide information from a judge, there will still be room for cover ups.

If we've learned anything from this administration, we must know that any place their is room to allow a cover up, it will be used and abused. (eg, the "Cheney is not a member of the executive branch" argument.)