Tesla Motors Club

Would appreciate any advice. I drive a 2008 Nissan Altima with 175k miles. I've long wanted an EV, but I'm fairly frugal and couldn't justify the cost -- especially since my car runs fine. Well, the Altima is starting to make some weird noises, so I've preliminarily begun the search for a different car. My wife's CX-5 cost us about $30k OTD last year, so I've set the same limit for myself. It's arbitrary, but comfortable. In that price range, it seems I can afford the following:

• Used S60 (high mileage, usually '12 or '13 with no AP and no warranty. Free supercharging. Probably have to look hard and wait for the right one to pop up at this price.)
• Used i3 or Leaf (Good value, low mileage, '16- '18, cool tech like Android Auto and adaptive cruise -- both of which I love on the CX-5. Some warranty remaining. But less range, less reliable batteries, and much less cool than Tesla.)
• New Leaf after tax credit (requires negotiating, battery quality unknown, big depreciation hit. But very solid range, many bells and whistles, full warranty. Still much less cool than Tesla).
• Some kind of PHEV, used or new (still paying for gas and doing oil changes and the like. Recent model years, some warranty, etc. Probably enough battery range for most of my purposes. Much more affordable).
• Wait a year or two for a used M3 (Let someone else take major depreciation hit, AP 2.5 and much better tech than all of the above, much better range...obviously have to wait a while and keep eyes on pricing while continuing to drive the Altima. I'm not desperate, but I'm ready).

Some things to know about my situation:

• We live less than a mile from a supercharger, and it's right in front of the grocery store we visit weekly...so the free charging on a used S is appealing.
• I only commute about 30 miles RT to work and only 4 times/week. Would obviously drive other places on the weekends and things though.
• We don't roadtrip much. Perhaps two or three times a year, but never more than about 5 hours.
• I like keeping my cars for a long time to extract full value. I've purchased 3 cars in my life -- all new, and all kept for over 10 years. Like I said, I'm pretty frugal. I like to make a smart decision upfront and stick with it.
• I'm pretty handy and have done most of my car maintenance the past 6 years. Oil changes, tires, filters, brakes, etc.

I can make an argument for all the cars above, so I've really sort of confused myself. You're all obviously huge Tesla fans (duh), but I couldn't find anywhere else on the web to post this question. Any thoughts and opinions are really appreciated! Thanks!