Hmm, thats basically what I did, (well not 30hp) but I had a 13/15 cutback, bored nozzle and a wore out engine, then this winter I ported and some other stuff along with the rebuild, added a wetwolf cone as well. Now I'm thinking I'm cavitating some.
Next time I'm out I'm gonna ride some...