RE: Time for a rebuild?
It sounds like it is time for a rebuild.
If you don't want to spend the cash do the .18 conversion it works and works well. Probably the cheapest and most noticable hop up there is.
If you do go with the OS all you will have to do is shorten one of the header bolts and then it will drop in.
rolland