It's cool that you guys are such awesome detectives and could deduce that joel was gonna die from that, most of the regular people aren't though and we thought Joel would accompany Ellie on some journey, with them having their relationship in tatters after Ellie found out what he did at the end of the first game, and Joel could have still died but towards the middle of the game, around the time you start playing as Abby, and for a different reason/in a different way.
Or they could have the game play out the same but instead of killing Joel in that house, Abby lets him live and he survives but he has severe trauma, leaving him cripple and barely able to speak, Ellie sets off in this vengeance quest but right before she kills Abby, Joel steps in as he's been tracking her with the help of Tommy, and at the last moment catches the bullet meant for Abby. Broken by this Ellie kneels down next to Joel and hears him say he's sorry right before passing on, with her saying she forgives him, but it's too late cause he's already gone. Then she stands up and tells Abby to fuck off and hopes she never sees her again.
I think more people would have liked this story better than the current one.