After the initial change i would dump it while its hot and straight after a drive, that way the water has not had as much time to separate from the oil and cling to different surfaces.
On the last change you do when you are confident its all gone, add some NULON.