Here are the new ones installed. I went with a set of KC halogens.
I managed to solve my dim headlight problem after a bunch of troubleshooting as well. I replaced the ground connector and pulled the contacts for the headlamps out and filed the corrosion away. Seems to have done the trick.
I also changed out the marker lights and put on some new lenses.