I would just stick with what you have; the devs have already said the way stat materia work in ARR will be different/less effective.