Ok, thanks to everyone for all inputs, My 2009 Calvin now handles much better, changes as follows
tyre pressure back 41 psi, front 36.
replaced rear SACHS shocks with IKONS, 2ND PRELOAD, REBOUND POSITION 3.
FRONT FORKS lowered 20mm in triple tree.
Next step a remap to richen things up a bit.