Making predictions about EVs is a risky business. Lotsa very large companies all over the world are working very hard at improving batteries, motors and home generation of electricity through solar panels.  It is very likely that in the next few years there will be some game changing breakthroughs. At the same time, it is hard to see how the internal combustion engine can be improved to the same degree.