@Shazzbot I think the Doctor calls Rory when Amy is “having emotions” is because the writers think it’s funny to make woman somehow more emotional then men. This plays into conventional stereotypes of women being hysterical and over-emotional, while men are portrayed as playing it cool under pressure.
I think River will appear again if the actor playing her agrees to be in more episodes and therefore has little to do with what we have already learned about her character. Although this final “sweeps” episode seems to attempt to bring closure to Rivers demise. The Doctor tells Clara that she is in fact (some sort of) “ex” [girlfriend].
My original point about River never deciding she is in love with the Doctor has to do with the problem of their relationship more broadly. That both of them are more or less told by older versions of their spouses that they will in fact marry and therefore everything happens as it should to avoid a paradox (they agree because they believe that their future selves do in fact agree to the relationship). They have to because the narrators (the writers) tell them what to think and feel. We have to remember that characters in stories are not in fact autonomous agents capable of making decisions.