Can't help with the fitting issue but glad you are going to standard headlights! That will change the car completely!