Even if it is 6 or 10, as I see it your still getting a LOT of bang for your buck.
Since you figure many of those skills are ones that have swallowed old skills:
Athletics (Str): You got Balance, Climb, Jump, Swim all in one.
Thievery (Dex): You got Open Lock, Disable Device, Sleight of Hand.
Also I am hoping that perhaps these skills that have been swallowed are still in the rules but in a different format. As Sub-skills.
Essentially you got your main skill, say Athletics which is strength based, so your Major Skill Modifier is Skill Rank + Ability Modifier.
However when it comes to specific tasks such as Balance, you add in Sub-Skill Modifier (say a Ability Modifier, or Synergy with another Major Skill).
So it becomes for Balance lets say: Major Skill Modifier (Skill Rank + Ability Modifier) + Sub-Skill Modifier (in this case Dex).
So you got all your old Skills more tightly and neatly wrapped, but still all there.