Yeah, I'm going to continue down this route @Lanx
It looks like I'm not alone here. My CPU and GPU temps are great now, but I think one or more of the thermal pads needs to be replaced.
I ordered that Thermal Grizzly pad, and 1mm Thermalright thermal pads.
When I bought this, I got the...