Mitch,
If your current car is still suitable, don’t forget that as a WPMS recipient, if you extend your lease you will get a weekly rebate from Motability of currently £7.25 per week during the extended lease period.
So, if you extend your current vehicle for another two years and save the rebates up, you should have a further £754 to put towards your next cars AP (It will actually be slightly more with annual increases in WPMS).
By that time (2025?), things hopefully will have settled down regarding semi-conductor shortages/covid etc. Also the electric/phev options may have more infrastructure available to you.
Also, should a ‘bargain’ suitable vehicle appear on the scheme during your lease extension period, you are free to pounce on it and cut short your lease extension.