Ben shows no recognition toward R2 and C-3PO. Suggested edit: “Come here my old friend.” Could also cut out Ben saying he doesn’t remember owning a droid, even though it doesn’t technically contradict anything.

Looking back at this and I definitely think this would be the simplest change that would address this issue. If you had Obi-Wan acknowledge R2 while Luke is unconscious, but then pretend to not recognize him or 3PO later on, it can be written off as Obi-Wan just keeping the whole truth from Luke for the time being.