Bingowings said:
I don't know how it could be done but an alternate take could be to kill Han in the Endor battle (so he never see's the Falcon again) and have Lando live and marry Leia (many, many years later).

That would make Harrison Ford happy, keep the cries of "You killed the only black character" at bay and what's more move him from the B list to the A list characters.

Killing Lando is more doable though.

I'm all for reshuffling the deck with Jedi, after the great build up of the first two films it was a let down and set up the even greater let down to come.

Lando getting together with Leia now that Han is dead? I like it.