Hard Chrome Pins definitely but while you are doing all that I suggest you seriously consider the SSL (Suplex) front suspension upgrade. Made my 4/4 much more tolerant of bad road surfaces and as a none racer I really didn't notice the supposed reduction in steering feel.
+1
the SSL kit has greatly increased comfort and handling on my 2005 PLUS 4. The kit includes front SPAX adjustable dampers. I also have changed the rear dampers with SPAX provided by SSL. The rear dampers where completly loose after 31000 miles.
The guenuine front dampers were better, surely due to the great stiffness of the front suspension inducing a small stroke. If your rebound spring are not free at static, the suspension works in a reverse way:
. very stiff on small bump
. becoming soft on hight bump
SSL kit makes the suspension working in the right way.
Now, no problem on rough roads and bumps... but it remains a Morgan not a Citroën DS.
I make tourism, not racing.