I've got a slightly massaged b16. My car comes with that engine stock so I didn't want to change blocks. I kind of like having matching vin's on my engine and car. If I were to do a swap I would probably be looking at a gsr or Ls/vtec. Just keep in mind that you are still swapping in a stock engine and it is not going to be unbelievably fast. You will however have a good starting point for future mods. I would say go ahead and get a good header/intake/exhaust system and see how you enjoy it. If you still want more power and love the car, open that bitch up and do the head, (cams,springs,retainers). Also go ahead and get the ecu socketed and chipped so you can get a custom map burned and be able to tune for any upgrades that you do.