Could Obi-Wan’s line to Yoda be changed from “when you taught me” to “when you found me?”
That sounds like an easier method than mentioning Qui-Gon. Especially since we don’t actually know which Jedi retrieved Obi-Wan as a kid. Reminds me of Plo-Koon and Ashoka.