Hi David,
Here is the link to an older post of my Cuda build. Go with the 2nd method that I used and drill out the whole headlight template and make a new one. You will have to cut the chrome dual headlight piece in half and sand away some plastic material, then glue them in from behind separately.
You have good skills, so this should be not very challenging.
Happy building ! Adam