Agree do the Full PADI Course not the quickie resort things. I did it before a trip to the US Virgin Islands over 20 years ago. Never regretted it. I also did the underwater navagation thing as well. I seem to recall that it wasn't much extra work. I still recommend getting a local guide...