I fitted the $12 headlight (
http://www.2kracing.com/Product/4426.html) today - it is not plug-and-play.

But for the price I can be prodded into doing a bit of work. Had some amount of grinding to do on the inner portion of the ring to get it to fit around the new lens but it now appears to fit OK. In my case I didn't really care about originality, I just needed a headlight! I'll pop some pix up later.
I am pointing this out as the headlight ring does need to be modified so those of you who are contemplating this need to be aware. But, unless you plan on shelling out the bux for the stocker after you win the lottery, then you don't have much to loose if you really need a headlight. And, hey, your lottery winnings will also buy you a virgin headlight ring!