Need help finding a replacement for my daily use flashlight. It is a Fenix E21. I like the two AA batteries, but what I need most is long throw beam. An 18650 would be great to upgrade to. Fenix , O-light or other economical, found on Amazon is also a bonus. Who has some suggestions, to help me out?