I just thought I would add in as a suggestion on the whole "The Jedi Master who instructed me," versus Qui-Gon stuff. Instead of having to mess with whole sections of TPM just to fix that Adywan, maybe you could change the line to, "A Jedi Master who instructed me,"?
Not a perfect solution that I like that much, but just a suggestion to save you some time later.
And to end this on a positive note, thanks for your hard work on ANH revisited.