Best rechargeable list: Nitecore MH25GTS should be replaced by the Sofirn SP36 in the 18650 section.
Or you could have another section on multicell rechargeable lights.