Remember to NOT OVER shave/sand.
I did the exact same thing in those area..but with a knife and it's loose as hell and won't work since it need to twist on tightly.
I got mine from some guy on this forum..fucked one of the bulbs up so since I was at EAS, I just tired and just got theirs and have them installed it. That's like $130 total on both set and it's the same shit. lol
The full twisting is the 1st issue. The alignment with the prongs in the headlight is the 2nd issue. Once you over come that you're done.