If it was me... I would not have any Skill Mastery affect combat-related rolls at all. That defeats the purpose of them being specifically about Skills. We already have Weapon Masteries that affect weapon-using characters in combat, and Cantrips that can affect magic-using characters in...