You may want to load that 2nd tune if THE ONLY difference is a couple less degrees of timing. 12.5 A/F is borderline as I stated before and should be okay as long as you don't try any extended high speed runs under boost. U.M.
take some time off work, get the car back to the shop, get the A/F sorted out. A short block is going to be 5-6k. Don't go WOT, get it fixed.