What configuration are you looking at for either the S or X? The S will come in much much faster than the X will. There's also some in inventory in Toronto for the S and X that have the newest hardware 4.0 / AP4 already so if you really want one now there's Model X long range's with the newest hardware available and Model S plaids with the new hardware in inventory right now here.