Seeing as its mostly a new engine (new fuel pump, new internals, new turbo etc...), think the best thing is to start from scratch. The stg2 map we made was a one-off dyno tuned map made for your car as it was at the time, any changes can upset things.
If you want an easy fix we can map out the slight boost spike so that the logs look better, see if it hels with the fluctuating fuel pressure.