Agreed, but it is too simplistic to separate mach buffet and angle of attack, because the shock waves vary with angle of attack.
Exactly.
Whatever stall you are talking about, reducing the angle of attack will reduce the severity of whatever symptoms one is talking about.