Here are the headlights I went with, both are halogen with replaceable bulbs. I was told they are direct replacement, no additional wiring required.
Low Beam: United Pacific Crystal Round Headlight 5-3/4",
https://www.jegs.com/i/United-Pacifi...31386/10002/-1
High Beam: Octane Lighting - Single - 5-3/4" Halogen Amber Yellow Glass Headlight Fog Light H4 60W Light Bulb
http://vi.raptor.ebaydesc.com/ws/eBa...71286000&ver=0
Both needed some modification. I didn't want to modify the existing light housing so I modified the light instead. Both needed some grinding and/or modification. Both have glass lens and metal body.
The pictures are a test fit and will need additional fitting to sit correctly.