I'd vote LED headlights. While the sticker price may sting initially, you'll most likely save money in the long run. You said you'll eventually go LED, and from personal experience/observation, many do, so skip the intermediate placeholder lights, and buy LED. They "should" theoretically last the lifetime of your Jeep too - no bulbs to replace, etc.
(mine are the Chinese knock-off of JW Speaker, and have been "fine" for the price I paid. I'd prefer the real thing, and still plan to upgrade at some point in time - as soon as funds allow actually, but I've been happy enough with them so far to not regret buying them.).
Despite "weird" artifacting, mine have still been a big improvement, and the low power consumption is nice. (just the extended battery life alone if accidentally or purposely left on vs conventional lights is nice).
Note: if you do NOT go the led route, research into adding relays to your headlight system, which will pump a little more current to your headlights as well as save you from burning out the headlight switch.
I did this to my '97, as they were notorious for burning out the switches (and me having to replace 2-3 of them agreed). I do not know if this issue affects your model year or not though.
*Also be aware that you may lose the hi/lo beam INDICATOR in your dash with this relay system (which may or may not also be a legal issue in your state).
After my headlights burnt my switch at highway speed during the darkest night...I personally deemed the relay system to be worth losing the hi/lo beam indicator (and planned to find a workaround at a later time).
