Eventually yes but is the time frame we're giving ourselves realistic? I can see battery technology improving vastly in a 100 years, not 20.
That's predicated on siding with the "George Jetson" principle of futurism; that technology will never to stop evolving, leading to a Eutopia for all of mankind, all accomplished thru innovation. I really want to believe in this but the cynic me sees the opposite, if I'm being honest with myself.
The opposite being the "Mad Max" principle; meaning we are already nearing the end of our golden age epoch. 100 years from now nations fighting over dwindling natural finite resources until civilization collapses as we know it. Throwing future generations, hundreds of years from now, into a new Dark Age.
I'm still pulling for George Jetson even if it's an exercise in futility lol.