If you already have an E2, then you can easily upgrade it to LED by adding a KL1 or KL4 LED head from Surefire. the KL1 is a tight spot of light that runs for about 3 hours in regulation, and the KL4 is a wall of light similar to the L2 that runs for an hour in regulation. Both are great heads, it just depends on your needs and applications. Check out the afformentioned flashlightreviews.com for reviews of these. Also, you stated that you are looking for a two-stage tailcap. Keep an eye out in the B/S/T forum for a McGizmo McE2s switch. It is a two-stage tailcap that will work with the E-series SF lights using LED heads. Great combo, but the tailcap has been discontinued, so the best bet for finding on is to watch for them here on B/S/T.
since you stated you are looking for an EDC light, I might also recommend the HDS EDC lights. I just picked up a HDS Basic42 XRGT from batterystation, on sale for $99. Most people who buy these are very happy with them. There are numerous options out there, these are just a couple near and dear to my heart. Good luck in your search.