What about an Auto-Jump. I pick where I want to go, and if the character has to jump to reach it they just do so, provided they can make the jump easily. If it is a hard jump, then stop the character and have them say something about it being difficult. For difficult jumps, a roll is needed and a running jump animation. If you fail, you still make it but hurt yourself and are prone. If you fail by too much... You fall.
Athletics are then more important for exploration.
And make Disengage just Disengage. Maybe even have a roll animation instead of jump, like rolling away or dodging away instead of jumping/flying.
