D) none of the Above.
Get a set of the Koiti H4 lights from Toyota, Cibie H4 housings for incandescent, or Holly Retrobrights, if you want LED.
I'm really leaning toward picking up a set of the Retrobrights to replace my Cibie's. With LED's, I can return my headlight circuit back to stock (I'm running a piggy back harness and relay set-up to pull voltage direct from the battery) and eliminate more potential failure points.
Cibie H4 housings are going into mine. I thought these weren't still available? I have mine in basement stock from 2016 when I planned to install them...