Classes and Jobs should be fine if the variation between class and job is explored better. Jobs can easily act as 'talent trees' or whatever from other games, where changing to a new job can completely change your role in a fight (i.e. gladiator DD).