Hey Joek
There are a few topics in your question that I think needs to be addressed.
The first is "Planning":
- As part of our open water training we are taught to always discuss buddy procedures with our buddy before the dive, including where you will be diving in relation to your buddy. I find it a good practice to always ask my buddy to tell me when they are going to inspect something, as I do when I take a picture of something. In this situation you are always more likely to know where your buddy or where to go and look for him.
The Second is "What to do when separated":
- Again we are taught in our open water course, ascend 1 or 2 meters\6 to 9 feet, Make a 360 turn looking for familiar colours (for no more than 1 minute), bubbles or something that resembles the group you are diving with. If you do not see anything, make a safe slow ascent to the surface and exit the water, without making a safety stop.
This is very clear... Yet the conditions in which you are diving could often impose other options into how you react to this.
The golden rule in diving (other than looking good, and never holding your breath) is that your safety comes first. There is no use in putting yourself at risk when the chances are that by getting help the rescue will be more efficient.
So if you do find your buddy - Great
If you don't and it is not a deep dive, find out from the Dive leader\master what to conditions are like in the general area where you are diving. If surface current are present, a safety stop could push you further away from the anchor line or boat. This puts you in greater danger. Always be informed!! No current - not as big a problem.
If it is a deep dive you will have to make the precautions necessary to make a safe ascent in such a situation.
When you do the deep dive speciality, you are taught to ensure that there is a extra cylinder, if you run out of air, as well as the fact that you have to start your ascent earlier (70 bar instead of 50 bar). You are also taught that surface markers are a good tool to help the surface support team to locate you, should you be caught in a current of sorts. I trust in my training and my computer to ensure that I am qualified to make decisions in situations like this, whether or not to make the safety stop, and if I do - how do I get the attention of the crew at the surface.
There are many other equipment options and training considerations that can assist you in preparing for anything that could happen on your dive, and this where planning your dive before you dive comes as a vital part of any dive you do, it should never be under estimated. Precaution is better than cure.