On the horns of a dilemma with that, eh?
I never can decide either, so I've abandoned the active verb for the gerund...
and use "I went diving..."
Rick
lol, i felt pc today and didn't want to offend anyone so I put all the options...
but I like your solution

and now, I'm wondering if buddy will offend someone :11: maybe I should have used comrade or companion or partner or...
