Finally got it back from the workshop sorting the suspension on it. Although it's taken two weeks it's not been a real problem as we wouldn't have been out on it that much anyway.
The first delay was the workshop got stuck on a couple of other jobs, then when they took my shock off and stripped it, it was knackered, new seals, spring and fresh oil (or whatever) wouldn't have sorted it.
After a conversation with them I decided to go for a YSS shock and YSS emulators in the forks. Unfortunately it doesn't have the remote preload on it, but it doesn't seem to be a problem adjusting it manually if necessary.
On the 35 mile ride home I definitely felt a difference, a good bit firmer all round without being harsh. I was on my own, Deb was in the car, so a trip out two up ASAP to test it properly is required. I'm confident my hard earned was well spent.