I would also recommend the water taxis, and avoid the organized tours. Yelapa is easily done on your own, as we found our first time there a year ago. We spent most of the day there, and saw the masses arrive when the tour boats docked, watch them get hurried here and there, and then packed on the boat to depart.
By far the most enjoyable time was in between tours, and we set our own pace for the day.
By far the most enjoyable time was in between tours, and we set our own pace for the day.