What I would do is, as usual, make a backup of your 3G and then restore this backup to your iPhone4.
This way you have 2 'identical' iPhones. Afterwards you could just deselect certain apps and/or settings
for your iPhone4 that you don't need or want.