Ryan is totally correct. I think your wise to hunt for a later one as I did the same. My warranty ran out 14th dec 2010.
As Ryan said the lights are an option at the factory and were certainly something that I had to have as like you i also feel they make a massive difference to the front end...