I still think its running too lean you should be making more power then that, unless the injector timing is out ??? The power curve doesn't look right to me but i might be used to how a petrol power curve is supposed to be ( nice smooth arc). Maybe you should go to another tuner and ask to do a power run and give you his opinion it shouldn't cost much, but you will have to travel to this side of town. Maybe hit up Dysons like Darren said and just drill them over the phone, they know their stuff and could probably help a bit more, you could try JPC aswell.

What style cooler are you going to run?? Water to air or air to air??