Okie dokie. I'm gonna say take the extra couple of minutes to include both of these in your warm up on days that you train calves. I have a hard time believing this problem will persist after a few weeks if you make a habit of it =)
You can do the first one with a tennis ball too if you don't have a foam roller available. I would recommend doing them in the order posted as well. Remember on the second one that it is not a static stretch, but more of a pulsing motion. Feel free to do these after a calf workout as well, in which case you can let the second one be a longer static stretch.