Right, @mark said the same thing, it definitely seems the simplest correct way (with the caveat that I mentioned, we lose SIGHASH_SINGLE which no one seems to end up using anyway).
Discussion
You could add SIGHASH_SINGLE back by just committing to which output it applies to in the signature (we're talking about a new sig system after all, so we can do what we want).