Headlight replace round 2 - what a pain in the A@#!

I bought headlights (not just the bulbs, the whole housing) form Octane Motorsports about 2 1/2 years ago. After about a year, I started having problems with the LEDs staying in their housing. Then, back around Thanksgiving, I had a local shop do an HID conversion and it has all gone to S@#t since then.

Net is the connectors are falling apart, had to take the HID's out but now the regular bulbs don't fit right so the headlights don't shine correctly.

When I look at all the aftermarket sites (Octane, CarID, etc.) it looks to me like they all resell the same actual products.

Has anyone had experience with aftermarket housings and lights that they think are of high quality? Please recommend

 

Retrofitted OEM headlights will be the best option, they seem to be higher quality across the board when compared to aftermarket housings.