I will wait on the 400 mi+. And yes I'm disappointed they changed this. If the Hummer is available close to that time frame I might switch to it as I like the looks of it.
I own 2 Teslas and I can tell you that you can't have too much range, especially if you live in a rural area like I do.