[classicauto]

Go with a reputable rebuild, which doesn't happen to be a Mazda re-man.

Your best option like you've laid out, is to rebuild it before it pops. That will minimize the chance of having trash parts for the rebuild.........