kato said..Can I just have a GT31 that's waterproof

and ditch the watch.
The GT was almost perfect
'Almost perfect' is going WAY too far! There are a large number of things that could be greatly improved on from the GT-31.
Waterproofing (or lack thereof) was always a huge sore point. Many of us lost multiple units to drowning and this was one of the biggest complaints.
The GW-60 did actually bring some very big improvements: 5Hz, Waterproof, Much better Genie. (I dont consider wrist wearing to be an advantage, but some obviously do)
But it also lost some features that are very important: Long battery life. Virtually unlimited recording time, ease of transfer of data via SD card.
A new device at around the same size as the GT-31, or slightly smaller, could reinstate the long battery life and recording time, and have a much larger screen for more information and clearer viewing with larger fonts. If it has inductive charging and BT/WiFi download, the case can be made far more waterproof. If it is able to be worn securely on the upper arm, it will eliminate the 'over/under' watch on the wrist thing for better reception. If it can be removed from its arm band and worn on (or in) the helmet it would have even better reception and reliability. And wouldn't it be great if it has a
'speed talk' function that could announce your current speed and then last run,
just like GPS-Logit does right now. 
It would be easier to hear from the bicep as well, being closer to your ears than if it was on your wrist. Even better if mounted on your helmet. The incorporation of Bluetooth would also make BT ear buds viable for the speed talk feedback.