I have just been through everything you are doing. Yes, Buy shims to the correct thickness. I have a full set from a stock motor, No Idea if there might be a thickness you need. As far as getting the shims out of the bucket I used a strong magnet. All that is holding them is a vacum. If you get...