Swap. Why spend hundreds to thousands of dollars on bolt ons when you can pick up a Z6 or a ZC at least for just a few hundred dollars, and you already have a much better motor than a modded stock motor.. Then mod it.
I went with the first swap I did (zc) because I just wanted to be faster than I was and I didn't want to waste my money on usless boltons. Once I wanted to go much faster I decided on the B16 because they're so fast totally stock, and much faster with some mods.