Great Idea! ( They will be your friend forever. ). Bring one down and donate it to your favorite DM - freind for life.-lol
Ditto on two wetsuits! Also, bring two swimsuits. Get totally dry between dives.
I really like the Scubapro 1mm neophene Hybrid Shorts.