Seriously ... navigation by counting kick cycles is not very useful except as a class exercise. First off, it takes way more mental bandwidth than just looking around at objects you will want to notice on the way back, paying attention to your depth and direction, and looking at visual clues like the direction of current or ripple marks in the bottom.
I also used to think it took too much mental bandwidth, but then I started diving a site where it was useful to take a shortcut over featureless sand. While doing this I routinely kind of counted, paying only half attention to the count while looking for big stuff out and about over the sand.
One day I was swimming merrily along when I said "Whoooooah. I just hit 50, and I should have hit the reef by 40". Sure enough, the swells over the last couple of days had changed the direction of the ripple pattern and by using the same standard angle off of them, I had veered to the left and missed the reef.
It might be because I'm using a frog kick, at a constant once per 3 second rate, but I've gotten so it has because a nearly subconscious thing to count kick cycles when moving off into more or less featureless areas.
-------------------
I find kick cycles is good for the shorter distances, while my computer (which only shows full minutes and no seconds) is useful for longer transits, such as the 20 to 22 minute transit it takes me to get out to a wreck near shore in Maui.
----------------------
Getting back closer to the thread topic ....... I don't find that surge affects my navigation at all, but current affects it in a way that might seem strange.
If I'm doing a transit with a cross current, I have a tendency to move UPcurrent. It took me a while to discover that what was happening is that I would pick a point on my compass heading and swim towards it. To continue to move directly towards it, I would crab upcurrent a bit .. in other words, I'd point upcurrent slightly to counteract the crosscurrent in order to end up moving directly towards my chosen point.
The problem is when I got lazy and would look directly forward to pick out another point to use as my target. Because I'm pointing upcurrent a bit, my next selection of target point is upcurrent of the desired track. I would check compass for most new targets, but choosing just a few by eye without taking into account my upcurrent angle would result in me being signficantly upcurrent at the end of a 15+ minute transit.