Apple Watch water mode during pool swim

I use my Apple Watch several times a week while I swim laps in an indoor pool. It works quite well measuring distance and speed. My problem is that the watch automatically goes into water mode once I start a pool swim workout. I understand that it’s to keep unwanted “presses” and to eject water from the watch, but I want to turn off that feature. I’m trying to increase my speed for swimming but at the end of the swim I have to hold down the crown and wait for the water to eject before I can end my workout, which usually adds 5-10 second onto the end of my last lap. Can we please make this a feature we can turn off if we want to? I’ve paused my swim in the middle of my workout and resumed the swim not in water mode with no issues.