The HTC devices are nice but I'm not a fan of anything Microsoft. The new BB 8320 (Curve 2) has fully functional WiFi and "should" be out sometime mid November to early December. As for EDGE, I have to state that EV-DO is faster but again, this will depend on your location. When HSDPA becomes available, this will be much faster. The problem at the moment is even with EV-DO REV: 0, A or B and EDGE/HSDPA, the hardware is still throttling the true potential. I think this has to do with the network itself being able to handle the "potential" bandwidth but am not sure on this.
Either way, the HTC devices are nice but if you're a true fan of the BB's, stick it out, get a Curve 2 and take advantage of the WiFi and a unlimited data plan which has just been release but implements a softcap usage policy to combat potential abuse of data.