After working out why I ended up on my arse on sunday I am more seriously considering upgrading the suspension on the Tenere.
The options I can think of from memory are-
Hyperpro spring kit.
Ohlins shock.
Now I think somewhere I read about Ohlins fork springs, but for the life of me I can't find where.
I also think it shouldn't be too hard to find an ohlins spring to suit the rear, but again, can't find any off-the-peg sources.

Anyone with knowledge on these things, or other options, please say.