Fixing the story would be effectively rewriting it in a different order and possibly throwing some context in at the beginning that brings Abby into the fold. Make her story an early part of the game, then the second half to the ending would be Ellie's to segue into a third installment.