Ah. Yeah, that does kinda complicate things.
Unfortunately, I don't really have good saves to share at the moment. I've been meaning to do a more thorough playthrough of the entire game and have a series of saves set at different points in the story, but haven't found the time. The only saves I have are test saves that have things missing or broken.