I've disassembled the logic board. I'm thinking if I need shims or not. How did measure the air gap between the processor and heatsink? Did you measure the buildup or thermal paste or the actual clearance?

Here's two photos of my heatsinks.

http://imgur.com/a/AXcED