I got the shutter bug long before the dive bug. I cant imagine doing any interesting and/or new activity without bringing a camera; I consider it just as integral to my scuba setup as the mask and octo.
I know you don't want to hear it, but I really hope you will consider following the suggestion to leave your camera at home for a while - or at least any time you are doing anything new on the dive.
Like you, I got the shutter bug long before the dive bug. Nonetheless, on my dive trip a couple of weeks ago, I left my camera locked in the hotel on the first two dives since I was using entirely new gear and was a significantly different weight than the last time I went diving. I added two new additional skills in three other dives (wreck and a deep enough dive to risk narcosis, with swim throughs). Again, the camera stayed either in the hotel or the camera tank on the boat. Yes, I missed some great shots that I may not get a chance to get again - but I am alive, had great dives, and have great memories.
My standard rule is anything new and the camera stays on dry land for at least one dive (new body weight, new gear, new site, new skills, new buddy, etc.). If I am comfortable after the first dive, I consider taking the camera on the next dive.
There's probably quite a few folks here who think I shouldn't have a camera in my hands yet - with only 49 dives under my belt. I respect their opinions, and I do not disagree as rule of thumb.