Trump should soon be looking for a new FBI Director. Comey has got to be on thin ice. Congressional summer recess would be a good time to replace Comey so Trump has time. About 100 days to look over many candidates.
He can’t remove him during an investigation or it will look suspicious. Afterwards, though, I would show him the door. He should have been removed on day 1.