I think Trump should let this play out a little longer, then decide if firing Wray is the best route. In time, I expect Wray will, appropriately, be fired. Trump should have Kelly have a heart-to-heart with Wray about any planned FBI “rebuttal” document text.
Why wait?