I'm a big supporter of Schatz but this idea that we need to "replace" the AUMF just sounds crazy to me.  Article I, Section 8 of the Constitution already takes care of that as does Article II, Section 2.  One says Congress is the only body that can declare war.  The second names the President as Commander in Chief.

Maybe if we went back to actually having to debate and declare war prior to bombing and invading countries and destroying them, we wouldn't have the problems we have today.