I feel like footage from 2016 wouldn’t meld well with footage from 1983

However you have given me an idea: The rebellion attacks an Imperial Shipyard that looks something like this:

Perhaps they are building a new Super Star Destroyer that the Emperor would personally oversee the final preparations of. Perhaps the opening scene could establish the Endor Shipyard and keep most of the Jerjerrod scene. Maybe the Star Destroyer can cloak (it’s established in Empire that small ships can’t cloak, but perhaps the MASSIVE star destroyer can)

Then Luke and the Emperor’s battle could take place on the cloaked Super Star Destroyer, which after the Emperor’s death uncloaks, and reveals itself to the Rebellion. The Star Destroyer is destroyed and the Rebels escape! They have achieved their objective!

Maybe the shield generator is actually powering the Super Star Destroyer’s cloaking ability while it’s unfinished?