Unfortunately, with your proposed mercenary and commando changes, one of those classes could, theoretically, join a warzone and capture a node or throw a huttball. To solve that, I suggest a stacking dot be applied to those characters after they click the join warzone button.