I'd just rent a shortie from the dive operator and be covered and done with worrying or trying to figure out anything. Renting it means you don't have to pack it or deal with it in your cabin, a shortie will make the difference if the water turns out to be just a little too cold for you and won't make any difference if the water is warm enough.