Need advices upgrading my Ultrafire C8 L2 U2

The 20R's are INR, not ICR - big difference. Here's the review and details: https://budgetlightforum.com/t/-/17136. HKJ's shown calculated internal resistance is the best of any batteries he tested. I got INR 20Q's as well and they seem just as good in my testing.