Two-dimensional vortex structures in the bottom boundary layer of progressive and solitary waves