I had my forks re-worked by MCT in Suffolk, they recommended linear springs and the bike is now MUCH better - feels more controlled, rides bumps better, does not dive so fast and gives more feedback. Maybe still not perfect, but huge improvement for a couple of hundred quid and far less than the £1,000+ Ohlins kit I really fancy.
Got a Wilburs shock on the back which is pretty good.
I am sure their spring kit would be an improvement.