Kendo, are you still on the oem tires?
As for the suspension, the answer is yes, worth it. I had my suspension, front and rear, resprung and revalved by Daughearty Motorsports in Indiana. $650, (which is about the cost of a mid-grade shock alone). He even preset my preload and rebound.
I also upgraded the tires.
My bike was completely changed as the suspension actually works now.