ROTJ makes no sense in this regard. Yoda makes a pretty big deal about Luke needing to finish his training, to the point where it is very hard to believe the only reason was to shield him from the truth about Vader, which is what ROTJ implies. And sure, Luke learned his lesson after his failure at Cloud City, but I don’t think that’s enough for him to show up acting like a full fledged and wise Jedi Knight at the start of the next film. I think you can try to rationalize it but honestly this is simply just a silly and poorly thought out aspect of the film.
The question is though, can it be fixed? Redtructuring is an interesting idea, though I don’t know how necessary. I honestly think it can be accomplished fairly easily with a crawl rewrite and some very minimal dialogue changes.