I think a hybrid of the two ideas might make some sense. Perhaps skills could be common up to level 2, and then specialize. In this case, perhaps you get Engineer 1, and Engineer 2, but after that you have to specialize into Engineer 3 (Jump Drive), etc.
A similar approach would work with...