I know this is a bit late but
I know this is a bit late but your cost estimates are way too high
As an individual buying cells for my home made electric car I paid less than $350/Kwhr back in 2012,
If I had been buying enough for 10 cars that would have gone down to below $300/Kwhr
I suspect Tesla (and Nissan) are actually well below $200/Kwhr including all of the assembly and battery electronics