I ordered a pair of the Efests to tide me over. I'll be watching for the AWs since I really wanted more than two.I just heard back from Provarifuel about the 18650's. They have corrected the listing for the flat tops and will be getting some button tops ordered in. If you need batteries now, you can try the other suggestions, or check back later for the red AW ones.
Thanks y'all. :~)