I did that RD course with you and the conditions in the lake were horrific. So bad in fact that I was happy to not have trouble myself, much less be able to tow someone else in. I did the same thing, saw the fisherman, swam my heart out and then I was still even with him. It did give me a new respect for the surf and the crazy people who have to go through it to dive. And by the way, the visibility in that area was 0' so diving under the surf to get out wasn't a good option
I didn't log any dives for that outing. The reason is that when we did the search and recovery I was only in about 5' of water and couldn't really consider that a dive. For the rescue portion (in the high surf) I never went below water as it was a surface recovery so that can't really be called a dive either.