no expert on bikes,, but for cars my experience has always been brakes first,, but since Ducs seem to be pretty well endowed in that dept then it has to be suspension.. ( just adding my 2p )
Another vote for a suspension set up. I don't think you need to change the shock for noticeable improvements but if you can afford to it may save you the cost of another setup if you fit one now.
