on Manage Connections, if your Wi-Fi has a yellow button next to it, that only means that you're not FULLY connecting to your wireless router and you are mos def on GPRS/EDGE! You would also be able to see that your Wi-Fi logo on the top right is greyed out. That's the same as a yellow button icon from Manage Connections.
before you re-do everything again though, go to Options first and go to Mobile Network; make sure to set Connection Preference to "Wi-Fi Preferred"
Everytime you're hooked up to Wi-Fi (Wi-Fi logo is not greyed out), you're sure all your BlackBerry services will go through Wi-Fi, saves you charges like me.. how to check? go to Manage Connections and click on Services Status: you should see
BIS Connection: Wi-Fi
BES Connection: Wi-Fi