Something should be done about Ben not recognizing R2 in ANH. Maybe you could drop in Ewan Mcgreggor’s line, “Great, R2!” as Luke wakes up and he comes out from his hiding spot.
Q2’s prequel edits remove R2D2 and C3PO having any major roles. I think that fixes the issue.