Mine will be going straight over to MCT here in the UK, they have setup my last few bikes and really know their stuff.
I tend to know what I want and can normally get a bike better, bt have found having these guys measure everything up and then re-spring / re-valve / fit aftermarket shocks gets the bike perfect.
I am sure the bike will benefit from more ride height (especially for my road biased riding) so have already discussed a Wilburs shock with 3 way damping, remote pre-load and ride height adjustment, plus a check of front springs and valving.
They are a good honest bunch and well worth a call to UK based folk:-
http://www.mctsuspension.com/contact.htm