I have a specific plan in mind about what happens coming up, but I have to admit there's a second option appearing that could be kind of cool. I have in the past selected the unusual option and taken certain stories or characters in strange directions.
Hairy conundrum it took me awhile to think of it but I got it. Make the canon story the way you wanted and the second story was how things were supposed to be if Annies time line wasn't changed. That way you can tell both. Just play it off when annie tells her boyfriend about this.