Don't use the k-mac rachet type kits, you are far better off with the shim type kit. The rachtet kits frequently come out of adjustment, and are more difficult and time consuming to align.
In fact you may only need a handful of shims for what you have now.
Rick.