That's a great point. I forgot to mention that I was going to take out that line by the Emperor.

EMPEROR
Everything that has transpired has done so according to my design. Your friends up there on the Sanctuary Moon...

Luke reacts. The Emperor notes it.

EMPEROR (cont)
...are walking into a trap. As is your Rebel fleet! It was I who allowed the Alliance to know the location of the shield generator. It is quite safe from your pitiful little band. [CUT: An entire legion of my best troops awaits them. ]

Luke's look darts from the Emperor to Vader and, finally, to the
sword in the Emperor's hand.

EMPEROR
Oh...I'm afraid the deflector shield will be quite operational when your friends arrive.

I think it's enough to smooth it over, and it makes Luke react to the shock that the Emperor planned this all along.

Are there any other inconsistencies that my edit would cause? This is why I decided to ask the wise people here before going any further.