It looks better but your WOT run was done too soon after the reset when the dynamic advance mult. had not yet learned up to 1.0 (in fact it learned up to 1.0 during your WOT run). I would try another 3rd gear run from around 2500 RPM to near redline if you can do so safely.
Something is up with your fuel trims. At times, the ECU is learning to pull up to 11% of fuel. That is indicative of a post-MAF leak (boost), bad MAF, or bad front o2. First I would get a pressure test of the intake done. Considering the repairs that have been done, a vacuum/boost leak (or multiple ones) is probably the most likely, although bad MAF or bad front o2 is not entirely uncommon.