@Fli
I'm bringing up a really old point, thus accept my apologies for missing the obvious...
Have you visited the rollers yet? Or is the car still running its original ECU?
About your earlier target of 200 ATW (or around 240-250 crank), have you considered light pressure forced induction? You might not even have to mess around with the internals. Go with an internal recirculating BOV and an AFM, and you should have a stealthy-ish automobile that doesn't hiss and pop like a starving cat having it's food stolen on every gearchange and overrun.
Or alternately, re-calibrate your initial demand to read 150 ATW, that's probably do-able - not easily mind you, unless you're using nitrous (incidentally, read Salarzae's signature)
Cheers!
Sami