8GB - iPhone
16GB, 32GB - iPhone 4
The iPhone 4 kicks the 3GS in the shorts. It has twice the RAM, more processing power, another camera, a better camera, 4x the pixel density, another mic, and I know I'm leaving out quite a bit.
Plus, you get a real bumper when you buy one.