If I were in charge of killing Han Solo, I think I would have had him die on Endor when the Rebels are trying to storm the Death Star shield generator (whose brilliant idea in the Empire was it to place the new Death Star's shield generator so far away from the actual Death Star?), possibly sacrificing his life for either Leia or Chewbacca.
And probably would have left the thing with Luke & Leia being twin siblings on the cutting room floor.