Re: the diving ? If it refers to an event, I'd use dive. Eg :Our first dive only lasted five minutes, but the second was longer./ We got up early and went for a dive before breakfast.
I'd use diving to talk about the quality of the experience : In that area the diving is excellent - in the same way as In that area the skiing is excellent. |