I would take the 8830 over the 8820 because of the GPS. GPS on the 8830 has saved me more times than I can count, that and its just really convenient. WiFi would be great but with EVDO I can definitely manage without it.
Posted from my CrackBerry at wapforums.crackberry.com