I did it in the Bahamas so I can't help you with the place on the Mexican Riviera, but I would do the swim over the encounter. When we did it the people who were doing the encounter wanted to change to the swim and couldn't as the spots were all filled. In the swim you get much more interaction with the dolphin. Kuki just wrote a great article on this. Its posted on the home page.