Well, that's disappointing to say the least. And I can't understand what Mazda was thinking on that, because it would have been a zero immediate cost resolution for them, and also probable that the engine either would never fail, or you sell the vehicle before it does. Not to mention that it would have resulted in creating a happy Mazda customer. Very poor business sense on their part IMO.
Unfortunately, it's going to take quite a few thousand miles to confirm for certain that the fix is good (unless there's a repeat of what happened with the previous repair). Not a happy set of options for you to choose from, and I hope it works out ok for you, regardless of which way you go!