If you could I would suggest holding out for like 2 more weeks. Rogers is going to launch the HTC Dream and HTC Magic on June 2. Android is worth a look.
Apple is having their World Wide Developers Confrence (WWDC) Key Note on June 8th. Where they annouced the iPhone 3G last year, and possibly a new iPhone hardware revision this year. I've been hearing they will drop the 8gb model. Add a 32gb. But the pricing will stay the same. So it will be like:
16gb $199 32gb $299.
I have also heard Rogers might be bringing back their $30/6gb data plan.
I dont know how you feel about switch providers, but Bell is supposed to be launching the Palm Pre sometime this summer. Its pretty slick.
Tons of options out there. Palm Pre, new iPhone, a ton of new BlackBerry's including the Storm 2 (No more Sure Press), BlackBerry Onyx (Sort of like a Bold), BlackBerry 8520 (optical track pad).
Just hold out a couple of weeks, Apple will have shown off what they have. The reviews of the Palm Pre will be in. The Android handsets on Rogers will have launched.
War is Peace. Freedom is Slavery. Ignorance is Strength.