I don't think so, first of all Tesla has to show that electric cars are affordable and a long term solution. If it cost 40k to replace people who want to move to the economical Tesla won't buy into it, even if the car is reasonably priced.
Secondly the cost of batteries is dropping off significantly while capacity is growing. This is working towards our favor, also the production of the Model-S batteries makes the production cost even more economical. When the battery factory is up and running, huge savings which will get passed on to the consumer.
Lastly Nissan has a 24kw battery pack that costs only $5,499 with trade in. And that's for a brand new pack. So get the Roadster back to the capacity we're at now (doubling the number) and its $11k, double that number again for approx 400miles range and its 22k. Those are numbers that Tesla will have to look at and compete with out in the market.