D9 Bungee?

I've had a Suunto D9 since 2006 and overall have been fairly satisfied with its performance. However, I had not been happy with the neoprene wrist strap and have replaced mine with a make shift bungee arrangement using zip ties between the threaded inserts with two bungees looped around for my straps. It has been successful for several hundred dives now but it is rather jury rigged. The reason that I replaced the OE strap is that I had the computer fall off of my wrist on two different dives, each time because of buckle failure. I was lucky in both instances to find it again including the first time when it took over 20 minutes to locate. More recently during a dive off of Morehead City I met a fellow diver who has constructed aluminum flanges that were attached into the strap threads and then offered a wider beam for attaching the bungees. This has made me curious as to whether there are any commercial products available such as the DSS Vyper/Vytek/Gekko computer and SK-7 compass boots.

Appreciate any insight or comments that other folks might be pursuing.