Go with the soldered shim. I've done a few years ago when Mike Orlen told us how to do it. It is the least intrusive, effective solution, and the guns I've done are still tight and on face. Chops