@dropd, I took delivery of a 90D. Given the situation you're in, making the same decision today, I'd still stick with the 90D. Comparing apples to apples, it's a $10k difference since Smart Air Suspension is included in the 90D. If this is something you don't want, then you can view it as a $12500 discrepancy. The other benefit to a 90D + Smart Air is you can do some towing. Even those who didn't order the towing package appear to have received a limited towing option (up to 3500 lbs). I don't know that Tesla will continue to deliver this way, but that provides a lot of extra flexibility.
It'll be toughest when the 100D comes out in a month and the range is up in the 280/290 range.. but I'm going to enjoy the car regardless.
@commasign, my average Wh/mi with my 90D is currently hovering around 330. 257 miles * 330 Wh/mi = 84.81kWh. That's probably a reasonable estimate for usable size of the pack. Maybe they overstated the P90D and were more fair with the 90D.. or maybe the difference really isn't all that great.