Powderhorn

Having the same issue, and it seems to get progressively worse if you try to do it on your own. For example, I kicked out my custom-made companion, a Ranger with a Wolf, and tried to resolve it by bringing the companion back in, but it just started causing issued with other party members, other saves, etc. etc. etc. It seems that without a patch to fix the saves themselves, this run through is toast :\