Plot-holes an AU wide, as I've said. That was the lousiest "remedy" ever! Either he wiped her mind, or he just pigeonholed it. If he'd fully wiped it, there should have been no issue; she could have even started all over again. Obviously, he just put a quick block in, so everyone needs to walk on eggshells around her.

And that protection? Also totally off! She'd blast everything in sight whether it's a friend or enemy, and then faint. Lovely, if an enemy comes up while she is out, they can just collect her away.

The Doctor clearly doesn't let others choose their fate, does he? He does what he thinks best, forget free choice! And it's not always what would be best for him either, is it? Your point about "saving" them both is well-taken. At least their bodies are ok, even if their minds aren't.... Furthermore, in his panic, he can't even do that right (see my first point)!