I dunno, to me the bigger problem with RotJ was the throne room scene.
Like, the first time Luke was about to kill Vader and Emperor is all like "YES! DO IT! I, THE EVILEST GUY EVER, WANT YOU TO KILL HIM" and Luke was like "Oh right" it could have just been a cheesy villain brainfart. But the ninety-eight other times just made him into a complete buffoon.