Model Y all the way, it’s about the EV ecosystem rather than just making an EV & hoping the software will work & that you can find a charger without the Leaf taxi charging to 100% whilst he sleeps, hogging it.
If the Tesla superchargers are busy they’ll tell you to move on after reaching a reasonable charge level, Tesla are way ahead of the fossilised companies.