Check your motor plate for flatness and replace the bulkhead/spur cover so that it actually tightens. It plays a huge role in keeping the distance between the spur and pinion at a set spot. Abysmal design... but it is what it is.
Instead of buying an expensive aluminum spur cover/pinion cover...