You will probably just dive the walls along the rocks that stretch from the Cabo marina to Land’s End (El Arco - the arch). I have dove here many times and really enjoyed it. The water is cold but last year I used my 3/5 mm but got cold on deeper dives, 7mm is standard there. Visibility not so good, but the abundance of marine life is incredible. I really enjoy Cabo diving. The sites along the wall include Pelican Rock, Neptunes Finger, North Wall, South Wall, Middle Wall and Land’s End. Google these and read about them. All of these are close together and only a few minutes, as in 2-3 minutes from the marina. There are other sites but probably too far to make from the cruise ship. It is a two hour trip each way to Cabo Pulmo which is the best diving in that area. I dont think you will be disappointed with the above sites. I am going again the last week of May.