One last potentially spoilery thought on River.
So if they really do decide to kill or 'kill' River this season, I want to see it be from her jumping again, but without the idea that she'd be caught. Maybe she could fall and 'die' the first time, and then when things are set right (because she must live to meet him the first time) he'll arrive and rescue her in the nick of time with the TARDIS...and that'll be the first/last time he does it. It seems like it'd work nicely.