Just for the record, I found a replacement headlamp, shell and all, on eBay, which came with a 55/60W H4 bulb. I replaced the bulb with a 35W HID, and couldn't be happier. The shell is chrome instead of painted, but it works. I had to make a bracket, held beneath the headlamp with the lower fork bolts, to mount the electronics for it, but it doesn't look too bad there.