Yep, that one works.
Just received my edcp7 from Elektro Lumens a little over a week ago. Living in Minnesota I have not had a chance to try it out on the bike. (alright I'm a wimp) but that boast a 2 hour run time with one 18650 battery. Seams like just a little over two hours for two is a little short.
As I said have not done a time trial on the light.