The future may have already arrived with a breakthrough in the energy density of lithium-ion batteries (the sort emtbs use).
Currently the energy density of these batteries is about 250whr/kg, well the sort that Tesla use anyway. Tesla believe that they can push that to 330whr/kg. Meanwhile the US Dept of Energy are funding a programme that will lead to 500whr/kg. If that is achievable then your bike may go twice as far as it can now!
But in Apr'19, Inolith - a small start up in Switzerland, claimed to have achieved 1000whr/kg. So not only will the battery propel your bike twice as far, it will weigh half as much!
Inolith are claiming that they need 3-5 years to get to a commercial stage, so late 2022 at the earliest. But I suspect that cars and mobile phones will be in the queue before emtbs!
Oh and a nice PS: The key to this success is changing the electrolyte. This happens to be a non-flammable one, so charging can be faster as well! And (this is my speculation) therefore you might be able to take your bike on the plane!!!
Electric car battery with 600 miles of range? This startup claims to have done it