Yea, at the end of the day, I'm happy enough to get whichever I get. But then my delivery window is 18 - 30 June, so fingers crossed.
It might be more realistic to assume that until NHTSA actually signs off on the headlight regulations, Tesla is not going to ship them in the US.