A six-year plan would be good for EON, if they are insisting Craig be on board for that long...
Then again, with the whole whistleblower thing with Snowden, this seems like a more topical Bond plot, to use that situation as a jumping off point, ie Bond has to reluctantly protect some Julian Assange type character (played by Cumberbatch) in a Living Daylights type plot, where it turns out to have links with something much bigger, in terms of those who are trying to off him.
It's a shame that the plot for the next film is most likely already past first draft stage, in that sense.