Should Swimming/Diving be it's own skill?

I could totally see swimming & diving being it's own skill, in the way that snowboarding and rock climbing are, in that it DOES build fitness skill as well at the same time, but at a slower rate and is also it's own thing with it's own unlocks. I would particularly appreciate that change if it also came with a swimming/diving aspiration, which I'd really been hoping for when Island Living first came out.