If I read some of those studies correctly, they were using higher doses of HCQ or CQ which were ones where the heart problems were happening.
Those studies in Lancet and Infectious Disease are questionable.
I think the effectiveness of treatment, is to reduce the cytokine storm. For that you need a combination of drugs.