I think it’d be a shame for Gray to lose any of the characterization he’s already had, so I’d suggest keeping him as-in. In regards to the timeline problems, we can always just handwave it all by saying “in the past,” though it depends on the severity of the consequences you want for each event and how they’d heal in time.
On another note, I'm leaning towards Logger, but will see what MM has to say.