you described my only current concern with evolved mode perfectly. devs, please consider adding the option to unmerge skills if wanted!