Looks like it should be able to make more then your goals.
Oh I meant engine oil cooler, if yours has metal chips in it, you don't want them going into the new engine.
Have you thought about having the heads ported ?
Do you have a good machine shop doing the work ?
Here's who I used, I can't view the link here at work, but they are well respected in the area.
185k, 5/20/12 new ej257 short block, 8/20/11 installed VF52 turbo, @20.8psi, 280whp, 300ftlbs. CHECK your oil, these cars use it.
Engine Build - Click Here