Just a thought, but is your 'clonking sound' constant or only under hard acceleration? If the latter, it could be your belt tension or changing up a little too early; but you sound too knowledgeable not have checked the belt or to lug the engine.