[johnny]

I think she might be in the astronaut suit, too.

I think the Doctor is the man she killed that got her put in jail. And she didn't know who he was at the time, then started meeting him more and more. Especially since in that episode, they showed that pretty much all of their "moments" had happened already. River didn't have any "spoilers" of the Doctor, because he kept saying that they'd done all the things in her journal.

I don't have a clue how it's all going to come together, but I think the writers are giving us bits and pieces and they'll stitch it all up at the end.