HKJ has tested your EVVA’s, see LINK
The protection circuit trips at 7 to 8 Amp.
Mind you, there are 4 parallel led’s in a Q8, and 4 parallel batteries.
So each battery has only 1 XP-L HI led to take care of.
I would give it a try, before ordering a new set of batteries.
And if you do: buy button tops!