I used "cut down" non cossie lights and found adding a 10mm nut under the grille retaining tabs before screwing to the headlight flange was needed to get them lined up better.
The trim can still be bought new from East Kent trim supplies, around £15 delivered from memory.
tabetha