Macbook Pro 15" or iMac 21.5"?

The iMac is certainly more powerful, but for what you're doing, that power really isn't terribly necessary. If you need the portability, then get the Macbook Pro. It'll do just fine for what you want.