I'm not saying that we need to leave things as they are--they need to change. But with what you propose, the risks and harms handily outweigh any benefit that can be obtained. Especially with entrusting a corrupt UN to handle enforcement of the current, ignored, and outdated pact.
The best way clearly would be to just rewrite a new treaty, with the U.S. taking the lead on such an endeavor.
Obviously what I have been proposing all along, where were you?