>However, what I think will happen over the next 20 years (with battery improvement, etc) is more and more hybrids and plugin hybrids.

I disagree. I think hybrids are a dead-end. They don't help electric car adoption, rather they hinder it because they validate every criticism about electric cars. Part of the reason why Tesla got as big as it did is because it didn't feel the need to argue for electric cars on gasoline-car terms.