Good on you for getting back into the pool.

I've been swimming for just over 2 years and I still sometimes get cramps in my calf or foot arch. It's usually late in a swim and doesn't last long. I've learned to swim through it.