Indeed.
Minor nit: the Falcon Heavy demo flight (with upper stage recovery attempt) is set for late THIS year, it's just that Musk puts the odds of successful upper stage recovery fairly low: https://twitter.com/elonmusk/status/847882289581359104
Musk is "fairly confident" to have upper stage reuse operational by sometime next year:
http://www.space.com/36412-spacex-completely-reusable-rocket...
Musk is notorious for doubling down on bets when the first bet seems like it most likely will succeed. I would bet you we'll see upper stage recovery within 1 or 2 years, with reuse of that stage within 2 to 4 years. (Particularly if SpaceX doesn't suffer another major failure within the next 2 years... Failures are always a significant possibility in this business given enough launches.) That counts as pretty darned soon.