This reads like a sound analysis. But I fear 'fixing the plot' is out of the question at this point. What should be possible is for Larian to learn from their mistakes, for their next games. They should make damn sure that they have a good backbone for the story in place, next time. It should be good enough to withstand and enable all story branches that are added, changed and removed later on.