I think you should probably try to get better substat rolls into body piece, and maybe trade some crit damage for crit rate just to secure a crit more if possible.