660 headlight housing replacement options

Both my headlights literally fell out of the grille last ride. The three tabs that are used to mount the house in the grille have broken off. I even got another used housing to replace one but soon as I screwed it in the grille, THOSE tabs broke off also!
So, I want to toss the stock housings and crappy lights in favour of a pair of round LED spots.
Anyone do this and have a write up or link to something? I’m thinking 4" size and modify/make a bracket to mount them in the stock location.
Any help would be great.