I rethought my choice for TFA, and decided that Han’s death should have been saved for some sort of emotional cold open for TLJ.
I agree, Han Solo should have taken Rey to see Luke, then they should have showed up to see Leia and the trio would be back together on screen.
Han could have left alone with the Falcon and had a dog fight in space with his son, emphasizing Solo and the Falcon going out together in a spectacular explosion with a Han Solo last words scene.