I did not. I don't foresee these two with a car in the $25k (after incentives) price range with semi-autonomous driving. And unlike the top level comment, I really want something fully electric (for the planet).

Don't forsee Tesla getting to $25K. The Model 3 really costs $50-$60K, and the incentives are going away.

I'd also suggest Genesis [0]. Almost S-class level in terms of features and comfort, with easily half the price. It's a luxury brand of Hyundai, so as a fan of brands like Mercedes I was skeptical at first, but damn is it a good car.

[0] https://www.genesis.com