You can create a shortcut to turn off the water lock on the phone. I've been using that, since I always had trouble with turning the crown to turn off water lock. I never managed to turn it far enough on the first try.The new way is more convenient in that you’re just holding the button down but the old was was much faster.
I’m just thankful it isn’t a dual action hold down and spin. I’d just leave my watch water locked for eternity in that case.