I dont know if its fine to merge lockpick with traps skill. Traps its a secondary combat skill, that provides benefits in combat. If the skill can be used to lock doors to help protecting positions, or there will be some locked rutes to engage/scape, then its ok.
But if it will be used only for footlockers, or secrets loots areas, i think it should be a separated non-combat skill