Yep, fair enough. I just personally don't like the way the skill system and combat interact.
My plan would probably be to leave the lists as is, but add might to anyone appropriate. If a player chooses both athletics and acrobatics, I'll tell them that having both is unnecessary.
Also, my...