Buy a $70 ratio adapter for the speedometer.

Your calculations will automatically take into consideration your tire diameter.