Keep the current classes and implement a Job Title system ontop of it that gives bonuses for using specific skills.