Thanks for the feedback everyone
The tensioner was a bit of a last minute decision - not sure myself if it works or whether it's a little bit too much...
Nic - I tested the Amp shock and liked the look of the Risse better. It also needs some new oil I think. I'll service it and see - love the ti spring!
Rockimtn - Not sure what to do with the 18" frame. SS, wall-hanger, sell?