Rebuild or Swap?

[WallaceMFG]

I'd probably do an exhaust and a new tune to take advantage of the gains from updating the top end of the motor, and bigger injectors if the stock ones can't flow enough. If you'll ever autocross the car, oil pan with baffles. Whatever you do with the heads, get studs put in them so you can use roller rockers. Polish the lifter valley to help oil flow back to the sump quicker. Lots of little things can help make power and make the engine more durable.