I'm in pretty much the same spot. I haven't tried to follow through all the spreadsheet's logic yet, but I suspect it is largely driven by adding in the new mid-2018 Canadian shipments.
Given that the new Nov 9 (IIRC) date Troy's giving me so far out from Tesla's brand new May-Jul, he might be making some assumptions that differ from Tesla's plans. Which is going to end up the more accurate? *shrug* I'm going the the strategy of resigning myself to sometime Q4, seems best path for one's own sanity.
P.S. The good news is that it appears that
current owners entering the queue now aren't going to leapfrog us longtime non-owner registrants.