I may be able to find the company we went with if I dig a little, I'll look later. We had a choice between a half-day trip or an all-day trip. The advice of the guy selling the trip was of course to book the all-day affair, because he said that way we could go further offshore, to an area where the fish were known to be biting. I think we boated 4 marlin, and probably could have picked up more, but the wife was seasick. I didn't like the fact that the guides threw the bait out and enticed the bite and hooked the fish, then handed over the rod to fight the fish. Seems to me the most exciting part is the bite. Well, I guess when those big fish made runs and jumped clear of the water, that was cool, too. I think most of the guides will give you the straight report on what's biting and what to target, as they want you to succeed, both to earn good tips but also to attract more business. TripAdvisor.com is another great resource for finding ratings of guides.
If you like real Mexican food, Los Tres Gallos is a must. Otherwise the food (and everything else) is fairly Americanized in Cabo.
It gets chilly at night there, something I wasn't prepared for. A night hanging out at Cabo Blue Bar enjoying their rainbow shots is a good time, but have a light jacket along. They brought blankets around when I was there, but I wasn't sure just where those blankets had been. Even with those we were cold, but having too much fun to leave.