Get a HTC Diamond or wait for the newer Dream or even Google Android enabled phone?

I have had the same phone forever, the Nokia 6100, which is a great phone. It is very old now and needs replacement. I have gotten a great deal on the HTC Diamond, basically 200 euros new (a friend works at a netwok company). Should I get this one or wait for the Google Android enabled phones? Does anyone know anything about the HTC Dream that is about to arrive? I would like 3G, WLAN and GPS on my next phone as well as possibility to use IP and/or Skype. Thanks for all your thoughts and ideas!