I think Frankie would never make a deal with Roth. He may very well have been angry on Michael, but he hated and distrusted Roth too much.

Besides, Frankie was an oldtimer who till then had always been loyal to the Corleone's.

So if this whole situation wasn't a set-up then it was just a spectacular coincidence which almost turned out perfectly for Roth....