you're right and you should say it. han never stopped being a selfish dick, he just gritted his teeth and did a few unselfish things because the girl he liked would've been mad if he didn't. him being halfway divorced and in denial just doing what he'd always done as a matter of habit/comfort was probably the most linear thing they could've done with him, the script's many flaws aside