A few suggestions... First, hydrate! Dehydration is one of the biggest causes of cramps, so drink up.. Avoid caffeine. Try eating potassium rich foods, such as bananas the night before and/or morning of the dives.
Maybe your dive shop will let you try out different fins in the pool to see...