Sadly, there were some easy fixes, which would've still allowed for a darker doctor

If they HAD died after The Doctor was unable to stop Kid, and he came to a (temporary) realisation that hurting him would do nothing to bring them back, it could've set him up to be less forgiving against The Rani