I'm sure someone on here could knock up a zoom to a Naboo console panel next to Padme when she lands with a saber prop on it and combine that with an altered take of the existing shot of Obi-Wan picking it up so instead of picking it up from the pumice beach he picks it up from the ship after the duel.

In fact he doesn't even have to pick it up Obi-Wan just noticing it would be enough.

Another possibility is when Obi-Wan drops his saber on Utapau he doesn't get it back and uses Anakin's sword to fight Vader.

But that would mean altering the hilt in every shot.