There is an aftermarket option out there that look well made but if you're a purist like me, you'll probably wait for mopar to get its act together. The company name is Traction Offroad.
I was looking at buying the mopar led headlight kit for our JL but they're on NBO too. Lol.