Sounds like you might be a good candidate for the Model Y when it comes out. I can't quite get together the $50,000 +/- for a new Model 3 right now, but in a year or so, I'll be watching closely for M3s coming on the resale market as early adopters decide to go for the MY.