You should be able to find a wide variety of 7" round H4 headlights, and H4 bulbs are available in huge assortment of types and wattage. I've had great luck with the Hella lights that I put into my JK, but Cibie also makes great stuff. I haven't used IPF lights, but I've heard good things.
You might also want to look at upgrading your wiring harness. The stock wiring to your headlights is probably pretty small for the wattage...you will get more light if you run heavier gauge wires powered by a relay - you can just use your stock harness to trigger the relays. A company called Susquehanna Motorsports makes a "plug and play" harness for the JK - I am sure that someone else makes something similar for the TJ.