I like your explanation of why River knew the Doctor's name MUCH better than the marriage explanation. To the extent that I accept River as canon (not much), this is now my personal canon to go with her.

I'd heard about Moffat not knowing the circumstances under which Mickey ended up in the TARDIS, but I hadn't realized an RTD failure to communicate was an issue on his other episodes. I believe it though. Oh, RTD, you mad welshman.