Simple: make weaponskills tied to their respective weapons, and class/job skills to their respective class/job. Problem solved.