I'm currently running a 16gb GS unlocked on Tmobile.

Picked up a 16gb 4.10.1 //4.3.3 Iphone4, will be getting a ApplesnBerry Gevey to unlock it for Tmobile.

What is the best way to get all my pictures/data off my 3GS and onto my IPhone4 without the risking locking my phone from Tmobile usage?