I wholeheartedly agree with the OP. Jump should be combined with Swim and Climb into a single Athletics skill. Similarly, I believe that Intimidate, Bluff, Disguise, and Diplomacy could be similarly combined.
What is so common about Diplomacy and Disguise that they should be one skill?
I see your point. Perhaps, I can see Diguise fitting in a larger Bluff skill.
I wholeheartedly agree with the OP. Jump should be combined with Swim and Climb into a single Athletics skill. Similarly, I believe that Intimidate, Bluff, Disguise, and Diplomacy could be similarly combined.