Settling and dispersion of inertial non-spherical particles in wavy flow