"they will likely want to narrow the allegations in the indictment somewhat to focus squarely on his failure to return the docs after GJ subpoena"
Um, that indictment already does that. He is charged with thirty-plus counts of unlawful document retension, and conspiracy to commit same. All those acts took place well after he left office. He is not charged with document theft or the removal of documents from the white house.