With the warm weather, I started working on the Z again. I got rid of the P0300 and p0507 by replacing the throttlebodies. Idle surge is now directly related to the fans kicking on. I'm solving it with a new charge pipe with the MAFs closer to the throttle bodies. This effort can be tracked here:
Advice new style Stillen S.C. Intercooler pipe (MAFs at TB)