just had this problem on my s2 changed nearly everything and after spending around £1000 it turned out to be the valve springs. Mine wouldnt pass 5000rpm either and it sounded like it was popping popcorn at 5000rpm dont know though if this could be the same problem has yours.