Apple Watch Ultra does not accurately record pool swim laps and distances

I am fairly active and have recently started using my Apple Watch Ultra V1 to track pool swimming workouts. At time is watch is close but not accurate and recently the watch does not properly track pool laps which is the main reason I swim with the watch. I have called support on this issue 4 times on this issue and received advice to send diagnostics, recalibrate the watch, ensure that I turn in the exact same direction on my turn. Defined the pool parameters accurately (I swim the same 25M short course each time) adjusted the watch so it’s High on the wrist and even applied a recent patch and none of these options have done much to improve the accuracy. For the first 300-400 the watch does an ok job However, over time it starts adding laps and distance so I can accurately keep track of the laps. Is the Apple Watch not good design for keep track of laps and I need another device in its place? Anyone else have this or a similar issue? I did find other threads outlying a similar problem with Apple Watch 5 and 6. Is this possibly fixed in the Ultra2 or is the Apple Watch not good device to track swims?