I don't think they have the contract free phones yet.
For me, the new one doesn't offer that much more.
GPS doesn't give directions, and needs Internet.
3G, I rarely download over EDGE anyway.
Everything else is the same.
But I recommend you wait for 2.0 for some time till things settle down.
At least till Installer is up.