Fantastic, I had the same thoughts about altering the timeline.
After seeing that it leads to nothing I would remove all his heritage complete with the flashbacks to his sister, letting him be a wealthy tourist where he is captured and brought to Narkina.
Anyway, I would love to get a link!