Hi folks, could I contribute some other ideas ... I like the points about vest with integrated hoods ... from winter sports, I have learned my lesson: hypothermia is cumulative, and it is easy to lose sight of that fact. Bundle up during the breakfast hours before the dive: knit hat, pants, warm hoodie. Try to have a hot drink too. On the panga, wear your knit hat and boat coat with your wetsuit before you get wet. After the dive, the boat coat and hat go back on, and then when the panga lands (at the resort or mothership or what have you) get out of your wet things asap , hot shower with plenty of water and hair conditioner to get the salt off (saltwater never really dries properly, again, making you vulnerable to little chills) put on dry clothes, have a hot drink, and overdress for the climate for a few hours, until you get a really good feeling of core body heat. Bring several bathing suits and knit hats on your trip so that you can avoid putting wet stuff on. The little chills do add up. Do this ever day and your last day will be just as comfortable as your first. As for boat coats: I just go to Goodwill and buy any old windbreaker several sizes too large. I probably look like an odd duck now and then during surface time, but hey, I am usually toasty, whereas I used to be cold all the time. (to the point where I needed to pee a lot as well ... tmi, sorry )
First, I want to applaud you for explaining the cumulative effect of cold. Of course I completely agree with all of your ideas about keeping warm, except for the hot shower. This is not recommended after diving.
Love the windbreaker idea and of course why wouldn't I, having done exactly the same and not giving a hoot how goofy I look!