My thoughts exactly. It will be interesting to see how the Azor Ahai and Lightbringer works out in the scheme of things, if he is Jon (vice versa).
The original was obviously at the same time as The Long Night, as part of the Rhillor prayer is iin the Night's Watch Oath, not verbatim, but there nonetheless,
For the Night is long and full of shadows.
I pledge ...for this Night and all those to come.
In fact regardless of if Jon is Targ, if he is Azor Ahai, he is in the best place to come back.
I think either Oathkeeper or Widow's Wail, could be a good light bringer, as they are already red and had the blood of a loved one on it, (I think they used Ice on Ned, didn't they?) Perhaps Jon will re-forge with a dragon, lol?