I had the same issues and bought a pair of shells ex USA
Diets 7in units. The threaded fitting is smaller in diameter which makes getting wiring in a little more difficult but the means of securing the threaded part is far superior.
Cost effective even with the freight charges
