Those are some very good - if incredibly radical - ideas.

I think it may be a good idea to replace the space battle from ROTJ with the one from ANH. The rebels plan out this elaborate attack, then get there and - oh shit! - the Death Star is finished and there's no shield. No Endor to worry about, eliminating Ewoks. Intercut the space battle of ANH (minus Luke, who's fighting Vader) with the in-the-distance battle of ROTJ (replacing any DSII shots with ANH's DS1).

There are a lot of logistical problems with this as well (how'd Luke get into the Death Star?), but either way, it makes for some intriguing discussion topics.