Just remove the skill and put the Disciplined Fist refresh effect on Form Shift.