May I suggest this change to Return of the Jedi: “Luke Skywalker has finished his Jedi training under Master Yoda. He has now returned to Tatooine in order to rescue him from the vile gangster JABBA THE HUTT.”
And then delete all mentions that Luke’s training is incomplete. We now assume he’s visiting Yoda because he was in poor condition when he last saw him, and he promised to visit later.