Might wait for the 2 but you know, I'd never get the first round of the newest stuff here. Unsurprisingly the new S is abundant with the classic paint or alignment issues.
Don't want to wait for the 2 only for delays and then disappointing first several months of production. So even if it comes...