I would go with more skill points, and a wider range of skills. (In fact, perhaps it might be a good idea to give all classes more skills and tie them to a character's background. So, a fighter of noble origin might have Knowledge, Nobility as a class skill and perhaps Diplomacy. Or a cleric...