dude the more I think about it, the more I think your figure of 200rwkw is good. You still have oem injectors and fuel pump, so the 201rwkw is a reasonable figure I think.
But as you said, since the apprentice tuned our cars, a retune by a more qualified tuner would most likely result in better figures at a safer level.
Fyi, when I spoke with John last week, he said that once I got the Z32 afm in, a retune/remap would cost me about $150.