I ordered a Model 3 and got a $10k discount on it, so I would suggest checking that route before worrying too much about the price increases; you might be able to get a higher trim for less than you think. I just took delivery of it today and threw a video up on my youtube page about it.