I still don't know, waiting to see the final details on the Model 3.
I did go for my third test drive today in Scottsdale and managed to finally get my wife to go along. It was a 90D with pretty much all of the options I would get, although I would probably get the 100D. I've always been impressed, but was nice to finally get my wife's impression(which was good). Nice smooth ride(as long as I didn't punch it) and quiet. I think she was more impressed with the interior room(especially when the back seats are down) and the frunk.
Still leaning towards the Model 3, but nice to have the Model S to fall back on.
On a side note I mentioned a certain statement by a troll on this forum about the lack of a towing package on the Model 3 and he was quite adamant that the troll was indeed wrong if not outright lying, but I think we already knew that.