Good that you are considering a license change, and I understand that you want to prevent commercial use. But choosing the NC option is in this case overkill and actually causes a lot of problems (like for example the inclusion in repositories of Linux distributions, lots of incompatibilities with other freely licensed works and it could not even be used on a larger LAN party as a tournament game, as they take entry fees to cover their costs).
A good/long read on why the NC option is not a very good idea can be found here:
http://freedomdefined.org/Licenses/NC
Personally I think the SA option also makes it nearly impossible to use it commercial (in the sense that you probably want to prevent), as you have to share all the content (and even the combined work) also freely. And all legal commercial efforts will not touch "free" artwork from the "internet" anyways as they can not verify it's all legit.
So in the end you just cause problems for normal open-source use when choosing the NC option, while not really getting a benefit out of it.
Edit: I license all my art projects dual as CC-BY-SA and GPLv2orlater, and I think that's the best option to ensure optimal compatability, while taking care that it stays free (as in freedom).