| You mentioned that the reason you are looking for more power has mostly to do with your mate's ability to pull away from you in the corners on an 8 year old bike.
Before you go about spending a lot of money on upgrading your S, or even considering an R, perhaps you might just solve your problem with a simple change of sprockets first? | 
Threaded Mode