Have you seen this:
http://www.kreiselelectric.com/en/projects/electric-golf/
They have a prototype of 55,7kWh battery to replace the original 24,2kWh battery of the older model. That would be really interesting to me, because it would make the car even better than the new model with 38kWh...