I was in PR last summer and enjoyed diving Desacheo Island, 45 minutes by boat from Rincon (west end of island, mainly surfer oriented) and La Parguera in the southwest (a small non-tourist fishing village) with access to "the wall" and coral canyons. Was considering Culebra before deciding on the circle tour of PR, ending in San Juan. Hope your trip was enjoyable, cheers!