good replacement for itp C8?

i have an ITP C8R and it's worth every penny i paid for it. right now i primarily use it for work. 8 coworkers bought them after seeing mine in action and all are still working flawlessly (used every day). i wanted to get another C8R (for my house) but they are discontinued. so now im looking for another comparable light, any suggestions? im looking for a great bang-for-the-buck light. i was just researching the fenix E21 and it looks like it could be a winner, am i on the right path? thanks.



p.s. i power my lights with enloops.