Just a thought but if a skill check is noted, maybe applicable traits could be used as a bonus die or as single die re roll option. If my character is hearty then it implies I’m good at traveling under duress and hold up better in those situations and there should be a tangible bonus. Allowing a reroll of one six sider doesn’t break the math badly.