I've heard talk about Harry using a time-turner soon after the battle to save Snape, but the idea of him spending three years to learn how to save him and then going back all that ways is quite original. And spending the three years together in hiding is the perfect setup for Snarry.
Still, everything is all hopeful and wonderful and then I end up sniffling!