If you disable Data connections in the settings tab but leave Wifi on that will make sure you are using nothing but your WiFi. also if you want you may try this Wifi speed cab. just install and soft reset you phone. It will speed your WiFi up alot (g band).
download here:
http://forum.ppcgeeks.com/showthread.php?t=49652