Looks good. I'm not sure if the issue with the headlights is that they were part of a mat zone with other items. If so you could probably still easily make them emissive, especially if there is already a trans map waiting for you. You can use a black and white image as a mask for what should be emissive. So for instance this was the set up I used to make an emissive matrix background:
Basically the white shows up green and gives off light.
Basically the white shows up green and gives off light.