I think the range issues are well on their way (but not quite there yet).  Call me selfish, but I like spontaneous road trips, and affordable EVs are still in the 2 to300 km range.  Better batteries, more quick charge stations, or both will bring me to EVs.  (I like the reduced maintenance and longer useful life at least as much as the reduced environmental footprint and cheaper fuel costs).

With any luck, that will be within 5 years.