Indeed. Your Combat Role is controlling.
This, by the way, is why I don't have pre-defined Skill Lists, love the Backgrounds from Dragon Magazine (which, combined with a "Choose Your Own Skill List" I think of as "Social Role" vis a vis the "Combat Role") and let PCs re-define the fluff part of...