The guide pin (A below) itself is bent slightly and angled down. Should this be the case? From pictures i have seen this appears to be straight, but i cant see how this could have got bent unless done intentionally.

I've put it back together with the new ring and plenty of grease, there is a lot less movement and gear change is a lot stiffer, maybe a bit too stiff but that could be because i am used to it moving around so much. If it should be straight ill take it off and stick it in a vice to try an straighten it without breaking it.