The trouble is, River goes to Stormcage for killing that "best man" - which, yes, is clearly at least made to seem like it's the Doctor. But at the beginning of TIA she's already in Stormcage, which means she'd know who she'd killed. Unless we're meant to believe that she's acting shocked over his death, I don't think it works.