Yes, lap both the CPU's heat spreader and the heatsink's base.
Get either Noctua NH-D14 or Thermalright Venomous X.
67C max temp isn't really what I'd call being "temp limited", though.