That sounds really convenient - I can't wait.
Honest question - just how much range would be acceptable for you? I occasionally think about this and I've got two figures as we're a two car family.
My car - 200 miles real world. Its a work car and to an extent I need the convenience of being able to charge when its convenient to me and my schedule not just when I've burnt up all my battery capacity. 200 mile range would require a shift in my work patterns as mentioned in a previous thread (spending time working while the car charges instead of from a hotel room etc.) but I could make 200 miles work.
Second car - Ideally 125 mile real world. My wife never does more than 60 miles in a day but 125 would fit our weekends where the car often sits in a little rural car park all day and we just want to get home after a full day out. We could live with less though as we could take my car out on the weekend.
Obviously the big caveat for the first of those figures is available, reliable and fast on route charging that doesn't cost the earth. That will really determine when its right for me to make the jump (well, to try and convince my employer to get me an EV anyway).
As for the original question, who knows what the next 9 years will bring but if momentum has really shifted to an EV future I think you'd be mad to buy a new ICE right at the eleventh hour. I'm sure whatever emission regulations an ICE is designed to meet by that point will have knocked any fun or character out of the powerplant anyway. You then mention the next decade or two so who is to say what Unleaded availability will be like in 2050? Will it be like trying to buy 4 star today? I mean you can get it but its horrifically expensive and scarce. I can understand the desire to keep an ICE if that floats your boat but a classic (by 2030 standards) or something from the next couple of years would probably be a better buy.