I've been working on a fic set a bit further ahead in the story (now sadly somewhat jossed but I'll survive) and a scene something like that was pretty much the personal canon I'd decided on, though not so sudden or insistent. So I'm definitely going with option 3.

Ah, River, so awesome.

And to be a little science fictiony for a second, I am VERY CURIOUS about this crack. How much of the previous seasons has been retconned? Will it stay retconned once everything's fixed? Is this possibly going to be a way to bring back Gallifrey?