You are overthinking this. The 4 standard singnals are enough for recreational under ice diving. If you are engaged in a complicated mission such as search or salvage, then you might need to agree on a more complicated communication protocol, or, preferably, use a voice link.
The emergencies...