In a sense, yes. propagation of a wave from an aperture can be thought of as a collection of plane waves all interfering to produce the observed diffraction pattern (plane-wave decomposition).
Surface waves can be very complicated because they are intrinsically a 3-dimensional problem, and a nonlinear problem (see, for example, Lamb "Hydrodynamics", chapter 9), so using them as an analogy to electromagnetic waves requires caution.