That was my plan too actually

I was keeping Gale, Halsin, and Minthara in my party and let Orin kidnap Yenna. It’s my first playthrough so I don’t know exactly how to progress that quest without interfering too much with other side quests like the murder investigations, or if I get locked out of other quests if I finish the Orin questline soon. But making the game spawn Lae’zel instead of Yenna at the end of that quest is my only hope now too

Or maybe patch 8, but I think I have to start a new game with that one right?