I've changed a few things on mine over the 5 years I've owned it.
First I fitted a Hyperpro rear spring as I'm always two up, this helped a lot. I could run zero preload one up and midway two up where as with the standard spring I was a max two up and looking more.
I rode like that for 4 years and 25k then the shock went. Bought a Wilbers 640 I think with remote preload and front fork springs. But had trouble with both. Bike was very high and hard, more like a sports bike, all comfort was gone. Tried 5w and 2.5w fork oil with 150mm air gap but still the forks where harsh to say the least. I removed the springs.
The rear was high, Wilbers had set the static preload at 15mm,my guess is to cover for a pillion. Once I removed 3 full turns from the preload all is much better, static preload is now 10mm.
I might refit the front fork springs with a 10mm shorter spacer now I've lots of free time!
Think I if I was doing it again I'd try Hyperpro both ends or take both to a suspension expert like MTC, Kas, etc.
Start with the standard settings and increase the preload a few clicks or lines at a time till the bike feels firmer but not to firmer or high. I think mine was 16 clicks on rear shock and one line up on the front forks. Rear damping I maxed then backed off 3/4 off a turn. Front I've set at standard rebound and a few clicks less on compression as I always find the forks harsh on small sharp dumps. Hope you find something to suit you, just remember its not a sports bike, never will be no matter what suspension!