I bought a Nitecore I2 charger from Amazon. They are around $15. It is definitely worth the investment in a good charger. I've seen it work where my batteries will charge fully, then the unit switches to a trickle mode. Unless I remove the batteries as soon as the 3 lights turn green, I never had a situation where the batteries were warm to the touch. I use it for all my batteries. That includes Efest and AW 18350's and Sony VTC5 18650's.
If I were you, get the Nitecore I2 or I4, and put away that trustfire as a backup.
With all that said, even with an intelligent charger, don't be overly comfortable and leave the charger unattended. I never charge my batteries overnight and never put batteries on the charger and leave the house. Also, after the batteries charge, let them rest for a couple hours before use.