A good mod that may help here is to reduce the unsprung weight on the front. We all know how heavy the front wheel is....if you could re-lace with an Excell rim and go down to one caliper as on the 660R the weight saving would give the suspension an easier time.