Vortex dynamics in the presence of free surface waves