On your edit, try putting the "Luke dragging Vader to shuttle bay" scene after the Executor is destroyed. The editing is still a little off in that the scene above feels plunked in - maybe if there was a more natural back-and-forth (regardless of whether we see Luke actually leave).

I still say have Luke take Vader onto the shuttle and whether we see him leave, have the final conversation between Luke and Anakin on the Endor surface AFTER everything has died down and they have the time to actually talk to each other (you know, without worrying about the Death Star blowing up in mid conversation?).

Davnes: I do really like seeing the rebel fleet zipping away.