I've got an older style as well. I've used a 3rd generation KL1, 4th gen KL1, and the KL4. The first two are probably not an issue since they've been replaced by the KX2, but just in case I'll describe them anyway.
Understand the following is merely opinion:
KL1 3rd gen: ugly purple beam, more flood than spot, about 4 hours runtime, doesn't come close to the E2's incan bulb but seemed great (due to runtime) about 5 years ago.
KL1 4th gen: has the distinctive square beam shape. More spot than flood, very little side spill, I think its around 3 or 4 hours runtime. A bit closer to being "tactical" like the incan bulb. possible alternative to the incan depending on your taste, but IMO still not close to the Incan bulb.
KL4 This is what I use in leiu of the incan bulb. Its very floody, Doesn't illuminate far of things like the incan but it does put out about the same overall amount of lumens as the incan bulb, just not in the same fashion. Your familier with the incan so just imagine adjusting that beam so that your have an extremely wide floodlight with very little ability to say illuminate a man at 100 yards in the woods. I would be comfortable using the KL4 in a tactival situation inside a home or outside at close range. You can get a two stage tailcap that will allow you to save the hour runtime unless you really need it. I use mine on low mostly around the house woods etc, makes it a good worklight.
KX2 this may be what your looking for but I dont' have one, I may buy one soon though to replace the older Kl1s
I'm also currious as to whether or not the E2DL head will be for sale seperately, if so then it should be a good option.