That is almost exactly the answer I was looking for.

I am also wondering if the scenes where Luke goes to confront the Emperor could be a bit more effective. Maybe because Luke willingly surrendered, he didn't seem to be in as much danger. Granted, Luke had only intended on confronting Vader and attempted to talk Vader into not taking him to the Emperor, but when Vader wasn't going for it, Luke just says "oh, well" and off they go.

Further EDIT: I really like looking at these films as acts. It helps me put my finger on what is or isn't working in the narrative.