In my edit, Obi-Wan never falls down the energy core shaft, and doesn’t lose his Lightsaber. Therefore, he no longer needs to use Qui-Gon’s weapon.
To accommodate this change, I’ve altered the colour of the Lightsaber blade, plus made the core a more bright white colour.
