There's 2nd stage "honking" which is just the diaphragm resonating out of water, and this will stop as soon as you're in the water. There's also occasional honking in piston 1st stages due to some strange resonance aggravated by poor lubrication at the HP piston, which will happen in the water but is harmless. You have a diaphragm 1st stage, os I assume you're talking about the 2nd stage honk. If it does not do it in the water, forget about it and enjoy life.
Then there are the true characters like awap who choose to dive with regulators/goose calls. Their regs honk by design. Too bad you can't buy specific 'reserve' tunes for the MK7, just like ringtones. You could set your MK7 up to sing something classic.
Air integrated computers will probably be having that feature soon. You will be able to down load ring tones alarms for your computer.