I have same bike and my mate has Focus Sam2. Both have the Yari and i have to say Focus seem to do a better job of setting the fork up as his fork just feels better tuned out of the box than the Vitus one. Glad bike is working better for you, however, I'm not a fan of the colour's on that Fox...