I think that having the fix post gortash fight (having it act as a final flag to progress whatever) might work perfectly well, as the speech back at camp gives you several prompts already to bust out some "what the fuck, we can still try to fix you", I don't even think it would diminish the impact that much tbh, to me it would make perfect sense to have it there time-line wise.
I'm not sure. Maybe. She pours out her heart and soul into how unfair it all is, narratively implying that there's no solution to her problem (hence the "we did all we could" part of her quest). If you just get right back into it, the tone change will be jarring.
Perhaps you keep the tone and the fix if you have her give up on trying to find one but you don't. Then you could have an ending where she tells you how much she loves you for not giving up on her even when she gave up on herself.
