Indict him for obtruction now. They surely have the evidence for that already. That's why the first judge said there was probable cause. The evidence he had government secrets is already in the open. We've seen the photos. Does it matter what was in them? They are not going to release the information in them anyway.
Let the special master fiddle around and add charges that arise from there when that process is done.
Also, appeal matters of law arising from the daffy judge in parallel.