There are already AP2 cars with free lifetime Superchargers that transfers available now. No need to wait for an AP2 car without supercharging that only goes 30 more miles per charge.
Good point, some of the 90Ds seem attractive, BUT I like the newer back seats (buckets on end, raised in middle) as opposed to the bench back seats that were replaced in 2017 I THINK, maybe 2018. I have been looking at some of the 90Ds though as well. Haven't seen anything to make me jump yet.