Just bring back Combat and be done with this experiment. It started out ok and was just made worse with every change since.