I see in your surge 4 log you did a stationary RPM step log. These steps looks good and indicate your MAF and injector data are ok, until you let it return to idle. At idle immediately after these steps you have massive fuel error and the fuel trims didn't seem in control just like your first log.
You then seemed to drive away, and you can see the fuel trims take some time to get in control from the lower RPM error. I think this is a hardware problem that presents itself at idle/ low RPM conditions.
Fueling error.jpg
When you look at your MAF in surge 4, it looks good when averaged out across just the period. Just at low air mass values it looks rich, But once you expand that to have an x axis of MAP values, you see the entire MAF shows lean error. This is just more evidence for a hardware not software source of this error.
MAF map averaging.jpg
There is no sense in tring to calibrate around hardware that is not operating correctly.