System 1 I think either is just fine. I might be tempted to go with the PhenomII myself as it's faster at stock and mines been rock solid so far. Any reason not to use the Phenom 940 rather than the 920 though? Very little price difference to go to 3ghz..
System 2, well there is no choice in your post
Bok