I resisted Li-ions for the longest time, but found few options sticking with AAs, so I made the leap to P60s powered by 18650 cells and haven't looked back since. There is much to choose from once you make the switch.
Oh, btw, don't be too disappointed with the discontinuation of the XRE SMO...