Seriously, if you're that worried, don't go diving.
Or dive in an organised group.
Do recommend you've got two decent torches on the basis if it's important, bring two. If you're in the water alone, you'll see the boat lights and just point your torch at them to let them know. They generally like to count back the same number of divers as were counted out, so won't leave without you.
Many torches have a strobe mode which is good for attracting attention.
The Lifelines et al are OK-ish. The satellite ones aren't so good as the message needs to get from the satellite network to the local coastguard and to your boat... The older Nautilus marine radio versions were better in that you could talk to your boat on channel 16 as long as it's not too far away and it also does an AIS alert if you push the button; setting off alarms on any boat equipped with AIS radios.
I've actually got a Nautilus Marine radio version. Took it with me once or twice before realising it's of very little practical use when a man-sized SMB waved around is far better. Really ought to sell the thing -- like a load of other stuff in my dive garage.
Big stiff SMB. Good torch. Maybe a whistle in the pocket, but not that useful.