S2 steering and driveshaft joints

[woodlandsale]

I believe I may need a new steering rack, because there is slight lost motion in the straight ahead position, and would like to find one that could be made to fit the S2, since original ones seem to be unavailable. I once did this job on a Daimler Dart (nowadays a standard mod- I was an early adopter in 1971). I used a Triumph 2000 unit- at the NEC I discovered they now use a Spitfire rack. Has anyone any experience of fitting a different rack on an S2, indeed of trying a Spit unit, perhaps?
I also want to replace the drive shafts CVs, or perhaps complete shafts. Does anyone know how to identify the correct ones to buy?

[woodlandsale]

Thanks for all the useful steering tips guys. I will certainly work through them before doing anything more drastic. Can anyone offer any ideas about the driveshaft UJs?