ok so I got my Z back wed morning after they replaced both ABS sensors and so far so good, I haven't had a problem yet but it didn't happen every day so I guess Only time will tell.
still going to do a TB clean the same time I install my 2 catch cans:
and maybe take the plenum off an clean that too
also on a side note they "forgot" to resurface my rotors so I have to take my car back on Friday