Since you can't use Analysis mode items in Combat mode and vice-versa, why loop through the other mode's items? The setup panel should have a switch to pick the mode and let you configure these separately, then Combat mode should rotate between combat items only, and the same for Analysis mode.