Steering column refresh - bearings replacement

[g300d]

I'm tracing a noise on steering that I've isolated to the steering column. A combination of light clicking and slight scraping.

Anyone here who happens to have done all the steering column bearings?

While I'm there I'd like to do all the bearings and I've identified the following. Am I on the right track?

For the upper steering column I am seeing 2 bearings, numbers 2 and 7 in the diagram?



And the for the steering column lower joint assembly I see 2 plastic rings number 3 in the diagram?



I saw a nice diy on here for upper steering column upper plastic bearing, nothing yet on the rest of the bearings/rings.