Just got an email from the SA saying that diesel won't switch over to 2012 until the fall. Looks like this might actually be depressingly true. I find it hard to believe that they'd still use two different headlights though.

If I order an '11 I'll wait till the end of March so that it's built with the '12 which get the new headlight to increase the odds of getting the new headlights.