One solution would be to dive in a dry suit - they would have more fitting flexibility. Or go all the way and get an immersion suit - a great Valentine's Day present!
_________________________
Geezer in Chief