For CHT issues, I'd always check the baffling before anything else. Doesn't take much of a gap in that to really raise the temps.