>The personal transportation industry will go through the biggest change it ever has in the next decade. Bigger than horse + buggy -> automobiles.

I'll take your bet on that one. The difference between having to keep an animal alive and in useful physical condition and maintaining a model T or A in roadworthy condition is far, far greater than the difference between one source of motive power and another.

I think your overall predictions are generally right but your timeline is too aggressive by at least half an order of magnitude.