Instead of replacing the whole light unit, you could just make up some new fibre washers to fit the current lights. Push the wire through from the rear and the duff washer should be removable.

Graham (G4FUJ)

Sold L44FOR 4/4 Giallo Fly
'09 Gen2 MINI Cooper ragtop
'90 LR 90 SW