CNicoll-
I'll be posting a trip report but unfortunately our trip wasn't as much fun as we thought it was going to be. Mostly we were a little disappointed with almost every aspect of our trip so it made for an overall less than perfect trip. We used Amigos Del Mar, who I was initially happy with and had read good reviews. We felt they lacked attention to dive briefings, overall safety and general customer service was lacking. One of their small boats burned through two containers of oil on one trip alone, they had to borrow oil from another company and the diesel fumes were awful and there was no where to escape them due to the size of the boat.
We wished we had looked more at Manta dive which is literally just around the corner from Amigos shop and they have much nicer boats.
The fish life is pretty spectacular, provided you have good visibility. Also, there were decent thermoclines on all of our dives and the general temp was around 68 degrees which my 5 year old compressed 3mil wetsuit could not handle so I froze my butt off. Let us know who you dive with, interested to hear different experiences.
We did an ATV tour with a company called Amigos (no relation to the dive shop). Baja Buggy's is right next to their location. You take about a 45min to 1 hour ride to the atv location. They take you through the desert up a mountain/hills and then to the beach which was really pretty. We did about a 3-4 hour tour which included lunch, after lunch you can mess around on the beach with the atv's on your own for awhile and then you head back. It was probably our best day in cabo, we did it the first full day there. We did have a two men who had about 4 teenagers with them. One boy (around 14) flipped his atv over on top of him, his dad had to pull it off of him and he seemed to be okay other than being pretty shaken up. He really wasn't going fast or being reckless but he flipped around a corner which had eroded unlevel dirt. While our guide didn't see it happen, he was pretty concerned and attentive to him for the rest of the trip. Definitely recommend the trip otherwise!