if your current car suits your needs it may well be worth extending for the 2 years and waiting.
if something then appears at a great price you can change at anytime during that 2 year period.
thats my plan next time, ive just taken delivery of a countryman and it suits me fine, i dont do huge miles and the car is great so unless something suitable electric comes up close to 0 ap in 3 years time i will be extending and wait for something special.