Thanks for the warm welcome, I think you're all spot on with the bottom bracket on the Scott, I'll take some pics and put them up for suggestions, the old one feels a bit gritty and is probably the original so over due for a change.
Not sure what the Diamond Back shifters are, they were...