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.
