The AW 2000 will be fine. They have a 10 amp cont. discharge rate vs. 24 amp for the 1600 mah. The 1600 also will hold the voltage around the 3.7v area longer than the 2000. Here are the specs:
IMR18650-1600 Specifications :
Nominal Voltage : 3.7V
Capacity : 1600mAH
Lowest Discharge Voltage : 2.50V
Standard Charge : CC/CV ( max. charging rate 4.5A )
Cycle Life : > 500 cycles
Max. continuous discharge rate : 15C
Operating Discharge Temperature : -10 - 60 Degree Celsius
IMR18650 -2000 Specifications :
Nominal Voltage : 3.7V
Capacity : 2000mAH
Lowest Discharge Voltage : 2.50V
Standard Charge : CC/CV ( max. charging rate 2A )
Cycle Life : > 500 cycles
Max. continuous discharge rate : 10A
Operating Discharge Temperature : -10 - 60 Degree Celsius