I would assume that the easiest solution will be to pick the new headlights from the BMW Mini, that will have to comply as well with day light as there would be virtually no changes to the car, except some electrickery