For good reliable wiring that is very close to stock I use the 32-50 bulbs, brattons reflectors and ditch the factory plugs in favor of spade connectors. I also run a dedicated ground to each headlight bucket. Works great and it's easy to do.
Your yellow lens might be "sun-turned",
http://www.glassencyclopedia.com/sunchangedglass.html.