Brent,
I think my 2005 865cc SM is adequate for it's purposes (as was the 790cc SM I rode for a few months last year). Enough grunt and the weight is just about right!
At most, I would go up to an 1100cc (not more) in the same frame, if that were possible.
