I'm a big fan of actually doing the math before swapping pinions willy-nilly. Measure the actual rollout of the tire, divide by pi to determine the tire rolling diameter and do the math from there. This will get the odometer as accurate as possible within the range of available pinions. To get the odometer dead-nuts accurate usually requires a secondary reduction unit.