Including the effect of depth-uniform ambient currents on waves in a non-hydrostatic wave-flow model