... There will only be mass adoption when EV's have both the driving range and cost sorted. ..
No, there will be mass "adoption" when you will be told "to adopt" this or that.
You've been "told" "to adopt" smartphones which are running on batteries which need to be charged EVERY day. Try to get nowadays that small lovely Nokia or Motorolla which served the purpose (to make phone call) and was running on battery for more than a week.
When the time comes - you will be told "to adopt" EV and trust me on this - you will have NO choice...