My 2001 classic 500 has a nice H4 halogen headlamp unit installed. I noted that three rather bent spade connectors had been used instead of the proper H4 headlamp connector so I order one up and put it in.
Bit of a tight fit in there - the headlamp bowl is too deep for the casquette and the H4 connector is being forced into very hard contact with the speedometer cable. I now see why the job had been bodged with bent spade connectors in the first place...
For a moment I experience that strange feeling of bodge insight deja vu. Then I formulate a three-way plan to make things better.
1) I discard the after-market chromed headlamp peak. This was pushing the headlamp bowl back a couple of mm into the casquette.
2) Like a madman, I file the headlamp bulb terminals so that the H4 connector slides all the way on. Another mm gained.
3) I use a small file on the bulb mounting slots so that the three bulb tags sit slightly deeper in the H4 bulb mounting. Alignment and focus still seem ok but care should be taken. Another mm gained.
My three star bodge outranks the previous two star one and the headlamp fits nicely now.