Trump could fix the problem with Wray immediately. Call him to the Oval Office and tell him it is time to rip the bandaid off of whatever crap occurred in the FBI during Spygate. Wray is doing more damage to the bureau by covering this stuff up and obstructing oversight - it will come out anyways.
Tell him it is the only way to restore trust in the FBI (that is true for half the country) and that he, Trump, will not pillory the rank and file for what their leadership did.
If Wray does not wish to do this, he can resign and be replaced by someone who will provide a full accounting of whatever occurred. This conversation should happen soon after the OIG report and declassification of the origin documents.
Screw the politics Mr. President - promises made, promises kept. Drain the swamp was your promise and it is past time to get started. You cannot make a deal with these people because they have a visceral hatred for you and making any kind of agreement to cover corruption for the sake of politics is not right.
If Wray has to be told, then he has already demonstrated that he is the wrong man for the job.