I did a lot of research on the stock 9004 headlights today, and then spent $18.88 for a pair of 9007 Sylvania Xtravision bulbs at Walmart, and modded my headlamps and wiring harness to accept them. It takes about 20 minutes a side once you know what you're doing.
Dramatic improvement in beam pattern and total light output (the old 9004 bulbs were also Xtravisions). It almost entirely fixes the too-wide gap between low and high beams. I still have a little too much light up close on low beams, and will work on tweaking that out tomorrow night.
This doesn't give you round headlights, but it fixes the worst parts of the stock headlamps.
I'll post a how-to on Friday. If you're impatient, Google "9004 to 9007 conversion". The final step that isn't mentioned on most of those pages is to rotate the bulb 60 degrees and swap the high/low wires so you have the 65W filament for low and the 55W filament for high. This fixes the lousy beam pattern you otherwise get with this conversion.