Coov said:
OK... what if somehow it were edited that he had his "ANH" saber the whole time? Maybe reveal it by igniting it right before his last leap with 2 sabers, and Obi picks it up on the rocks?
Not bad. That allows for his saber to be red during the duel, but lets Obi Wan still retrieve the blue ANH one.