Right, the correct way here is to simply grant _everyone_ a license to _everything_ under the terms of the AGPL (or whatever). You can then separately license portions under other terms.

You don't need to note the commercial licensing option in the license itself; it's irrelevant to that grant. You just state that elsewhere.