My biggest issue with MCH is Heat Charge should have 5 stacks instead of a time limit.

I can't use the 5 charges in time due to bad ping and clipping.

Your aoe proposal sounds good.