I too am always on the hunt for the perfect flashlight. I recently decided that I'm tired of spending $20-30 for what amounts to a $5 flashlight. I stopped by https://www.reddit.com/r/flashlight to help with my preferences and requirements. I am probably getting ready to order a Nextorch PA5, as I really like the ability to zoom, I use that feature all the time.
Other than the side switch, do you have any other requirements? I know that you would prefer the ability to use AA batteries. How high on your list of wants/needs is that? Do you want your new light to only use AAs, or do you want it to primarily usean 18650, but could also use AA? What kind of brightness are you looking for? If using a rechargeable battery like the 18650, do you want to take the battery out to charge, or do you want "on-board" charging (usually via USB)?
Edit: also, do you want more of a flood light, a "thrower" that is more focused at a distance, or a zoomable (zoomie)?
Someday I'm going to pull my life together. But that day is not today. Today I'm driving a stolen police car.