Moffat's a better writer then to use the River Song storyline again, she didn't recognise the Doctor before the memory delete so I'd rule that out completely anyway. I have faith that whatever he's got brewing is going to be better then "go back in time and save her" too, as he's let hundreds of extras die without ever going back to save them, so I doubt she's going to be any different in that respect. It'll be some sexy plot twisting timey wimey magic that brings her back.
In typical Moffat fashion, the events of the first episode are always important later on, so I'm with you on the relevance of the reset becoming a crucial point later on. The Silence, Headless Monks, and Madam Kovarian all worked hard to prevent "the question" from being asked, and he's unwittingly prompted an army of insane killing machines to chant it over and over, some dude broke into their top ranks of parliament and gave them the finger, they mad (and I love this).