[Jimbuna]

You are correct in assuming it is down to the drifting action.

The game has never allowed for sea state/wind (funnel smoke example) unfortunately.

The quickest way to stop the drift is to throw your engines into reverse....stopping them when you approach 0 knots.