Have you tried the Fenix PD35 with a 18650 battery. You mentioned that you are using 2 rechargeable CR123 batteries. Fenix specifies using CR123 lithium batteries, or a 18650 battery. Rechargeable CR123 batteries are different.