The imperial lady calls him Obi-Wan in Episode 3, in front of Leia. I also find difficult to buy that she knows about Obama in Episode 4 but doesn’t realize he’s the same Jedi she met when she was ten, especially considering she supposedly remembered her mother.
How does Obi-Wan find the kidnapper ship in Episode 2?
“When last we met, I was the learner.” Vader literally says it in Episode 4.
I’ll admit that one is the most likely to be patched up.