The way to broach the Market with new battery tech might be an expensive battery package for the Roadster. You get to have them out there in small numbers, the wealthy pay for the operation, and if they fail, there is not so much of a hit on any halo product.
In the FVH video interview he mentions they are just now doing research on the 300 mile S battery. It's a long way to the Model S. I see them packaging a Roadster option first.