Matrix visual with calculation group: sort columns by measure first and by calculation item second

Hello!

I have a matrix visual with a calculation groups and several measures like this:

However, I would like to have the columns sorted by measure first, and then by calculation item, like this:

Is this possible, and if so, how? I don't need tips on how to disguise that it's two visuals like in the mock-up, I would prefer to indeed do it in one matrix.

Thanks for your input!