I've been looking around for upgrade options for a while and found some great but expensive option (LED and HID). Found these sealed halogen lights from Truck-lite and just installed them on my truck They are a direct swap and higher quality from the ones I've seen and read about on Ebay. They are DOT and SAE approved, lens is glass and back is aluminum and comes with the required bulb. I found out they are listed on Amazon, ordered them and they arrived about a week later. Part number 27009, they are listed as 5x7 and are a direct replacement for our H6054 standard lights for 2nd gen. I will be testing their brightness out tonight, also will be upgrading the bulbs later on They look much better than the standard lights.
Here's the link to their site for all the specs:
Front comparison Back comparison Bulb One light on