That sounds like a very wise decision. There have been a few instances on this forum where people have been desperate to get an EV, primarily for the cost savings, but when they describe their situation it is obvious that it wouldn’t be the smartest choice. I was fearful that you might end up in a similar situation.
As you say, the great thing about a lease extension is that you aren’t tied to the full 2 years and you can order a new car at any time, so if something that fits the bill and sets your pulse racing should suddenly appear on the scheme you can pounce. It’s a good position to be in as you can do it on your terms and at your pace. Good luck with everything. As you say, sometimes we have to put these things into perspective.