I don’t see anything wrong with what you’re doing but how much massage work are you getting? When ROM is decreased like this, I wonder about the status of the muscles themselves. Lack of shock absorption through the calf muscles leaves an inordinate amount of the absorption role to the achilles.
Taking the knots out of the calves is painful and may cause you to miss a few days of running but helps big-time over the long haul.