I like #2, it sounds pretty interesting

edit:
although I still think that crafters/gatherers shouldn't have been their own classes that you have to change to. We should just be able to use any certain tool for any certain task and level up the skill itself.