Saeviomagy
Adventurer
I'd argue that while mariner is a step in the right direction, being able to swim and climb slightly better than you already could do with the athletics skill is far from the level of non-combat performance that most non-fighter classes have. Swimmable expanses of water and climbable surfaces are sort of the non-combat equivalent of killing the rats in someone's basement.