1) So the TPP has one good thing in it. Pity only the one. If there's more good things, no one has said a word.
2) Given the way Congress and courts work, this will not be over soon. Even if Congress passes a law, I think the government could argue that the case can still be tried as a "grandfather" case. I remember reading on lawsuits and prosecutions "grandfathered " in some years ago but those were at State level and not national so... maybe it would go away.