IF you have the vvt turned off in the tune, go to all the NWSOLLE tables at set them all to 18. That way its solid state timing and if something weird happens it doesnt bounce between KFZW and KFZWOP or KFZW2 and KFZWOP2.  Its what I did when I was working on mine. Untill I had everything else all finished out, I also went and capped duty cycle with DRL and then chased boost stuff when I was positive fueling was sorted.

I would be happy to send you the updated version of my file privatley for you to try, but don't want to throw it on forum untill I get a little more progress done on it, but current does have more then you are working with on my v2.