While you are ordering parts.... pick up a set of TBS needles. They are about 12 bucks... And KEEP the shims, because they are simple to add later, but I would go back down to none and start there.
Oh I put in two shims in the calculator cause that is what you said you had.
