I don't see why we need complicated changes and solutions, when the obvious is just,
when you defeat the goblins and rescue H as usual, Minthara escapes after being around you in the fight long enough to have felt silence=doubt. defeated and shamed returns to Moonrise and then you find her in prison in act 2 and rescue her as usual.
Like instead of both being recruited in new ways, recruit both in the exact same was as currently just in the same play through.
