I'd also get a loaded 90D. Every now and then I get tempted to price up a new S, and then realize these things are bloody expensive! When I got mine (early 2013), I think the pricing/bundling was still being worked on, so was reasonably good value; mine was $87k, before the fed credit, for just about everything aside from rear seats, dual chargers and 21" wheels. Now I'm looking at ~$120k. I think if I sold today, I'd get something around $55k, so it's losing around $10k a year, at least for the first few (warranty-covered) years. This makes me seriously consider leasing the next time around. Typically I'd be against leasing, but with the S essentially being a really expensive iPhone on wheels, the natural progression is to upgrade every few years. The lease price for the spec I'd want is about $100 more per month than my existing loan, so I'm not sure the value is really there, but the convenience factor, and knowing that I'd get a new S (or Model 3) every 3 years, is attractive.
I'm building a house at the moment, so that's the main reason I'm not pulling the trigger on a new one, but I agree with others, I'd expect a sensor refresh and face lift within the next year. The only thing that suggests that won't happen is that the dash of the X is identical to the S (aside from he console), I really expected it to be upgraded, and then rolled back into the S within the next few months. I do think the nose will eventually be aligned to the X; for brand equity, there really should be a stronger family resemblance. Right now the X nose and daylight running lights work against that philosophy.