The "clunk" and the "click" are two different effects -
The clunk will come from the steering rack area - you'll hear it when the vehicle is at a standstill, and you move the steering wheel JUST off-center, either left>right and right>left (basically rock the wheel back and forth). The cause was identified by the TSB I mention in this thread (steering gear bushing).
The click noise, which I call the "zip-tie" noise, is thought to come from a rivet or the horn pad area in the upper steering column. As i mentioned, my dealership previously diagnosed the cause as the SRS clock spring, which was replaced, but it di not solve the problem! The zip-tie noise, or click, happens anytime during an either left>right or right>left turning of the wheel. And it is not consistent (comes and goes, in my particular instance).
Now, supposedly my dealership, with the replacement of the steering gear bushing, will solve BOTH the "clunk" and the "click" noises (a little hard to believe, eh?), but maybe removing the slop in the steering column is a remedy for both - we'll see.