F1 steering or rebuild two tooth.

[Russ/40]

I'm not happy with the results of the refurbishing my 7 tooth steering. I reused the worm and sector but restored all other components, bearings bushings etc.
I have a two tooth column they needs a total rebuild and I'm looking for your experiences with the three options. New worm and sector for the 7 tooth; rebuild the two tooth, but have to change the steering wheel; or lastly, put a modified rebuilt F1 setup. Pros and cons of them all. Would a rebuild of the two tooth using the needle bearing modifications equal the F1 conversion?
Appreciate your experiences -