[zrickety]

You definitely need a new pinon. Might as well do the ring too. Start with your current shim setup but don't be surprised if you pull it out a dozen times to get it right.
I went with Motive. My final shims were quite different than original, but the initial measurement helped me get it right.