It's hard to tell how long it might be before big leaps forward in battery technology (e.g. solid state) might be a production reality. Buying an EV today can still make a lot of sense, however, especially if buying nearly new, with some excellent discounts to be had.

You just need to carefully think about the sort of driving you do, and whether the typical real-world range of current and recent EVs is suitable. The ability to charge at home is very important, and we'd recommend moving to a variable electricity tariff and timing your charging sessions to coincide with cheaper off-peak periods.