How about using a ball link at the servo end ? I could then mount the servo in the same position and I wouldn't need to worry about slight changes in angle.

I use the rocket city ones all the time on helis so I don't really know why I didn't think about using these before. Or would the 1.5mm bolt through the ball be an issue?