I'm glad my analogy helped ;)

I didn't sort it - someone else did namely P&H. They took it all apart and put it back together. I thought thats what they said - not the center nut but under that. They also machined the top yoke so it didn't catch on the lock stop.

Was it worth it? No. As with most stuff I learn the hard way.