Have you looked into adding navigation / mapping / and comms to your dive computer? My company has a side project building a dive watch for divers. It has a navigation system and communications aspect where divers can send messages to each other and track a dive buddy's position. The project is mostly for fun but there is a market for it.