Obi-Wan and Qui-Gon shouldn’t be master/student as this contradicts what was stated in TESB but as friends or as two Jedi who work together with Yoda being the one who instructed Obi-Wan or both of them.
I’d rather change the Originals to not contradict the Prequels if the alternative is going through those mental gymnastics.
Agreed. A lot of people tend towards OT Purism, but I think it makes more sense (and less effort) to support whatever piece of conflicting canon has the most evidence in its favour. Qui-Gon is Obi-Wan’s master in TPM, and it’s mentioned in the other PT films and the Clone Wars. Best to roll with it, I reckon.