Microswimmer trapping in surface waves with shear