Changed both drag link and track rod today, two of the joints came off easily. I had to grind one of the others off and drill through the last one to get a pin in to hold it still whilst I undid the bolt.
It drives a lot better, I just need to centralise the steering wheel now - job for tomorrow...