So I was thinking about the last River episode and I hit a snag.
We first meet River in the Library which is the end of her story and she has filled the diary and has the Doctor's specialized sonic.
Then upstream we have the 11th series where she does a bunch of stuff.
In there three relevant important events happen.
The Doctor's (three) save Gallifrey, Trenzalore, where the Doctor has died and River opens the TARDIS with the Doctor's name, and Time of the Doctor with the town called Christmas.

Now in the last one Clara has the Time Lords regenerate the Doctor for the 12th time and avoid his final resting place on Trenzalore.

However at the end of season 9 the 12th Doctor meets River for the only time and gives her the sonic over dinner.

I am having trouble unraveling the timey whimey ball with the timeline that should have occurred with the 11th Doctor having to die on Trenzalore with River getting the sonic for her to go back to the Library. I also am having trouble with the size of the diary since it requires Time Lord intervention to get the size right for the Library.

Any fan theories attempting to unravel the ball would be appreciated.