cdiver2 :Correct me if I am wrong but as I remember you should never fight the current as this will only lead to exhaustion and drowning
With a full BC, and 7mm wetsuit you should not be in danger of drowning. In fact, sinking is going to be real difficult even if you wanted to. Unless you still have your weights on and let the air out of your BC you are not IMHO much danger of drowning. In my view surfacing with the Boat in sight attempting to fight the current in a reasonably fit diver in full gear would increase your chances for survival. True it may eventually lead to fatigue. If that happens, you just relax, and lay back on the big water bed we call ocean and float. But also note that swimming toward the boat will also either get you to the boat, or at least help you not drift away as fast. Both of which will improve your odds of being rescued.
Not the same thing, but when diving Point Dume, we routinly fight the current for 548 yards, and that is normally on the way back.