Buy 1900XT now or Wait till R580+ ?

[sunzt]

I'm building a Conroe setup sometime in late july/august and have been looking quite fondly at the X1900XT as a video card solution to replace my uber TI 4800. However, I read from other posts that the R580+ will be coming real soon (sept/august) and that it may address my main issues with the 1900XT: power, and onboard crossfire (don't need crossfire compliant mobo i assume).

Question: Should I wait for the higher priced R580+ or buy the 1900XT now? Or, should I wait for the R580+ then buy the 1900XT after price drops?

If you suggest getting the 1900XT now, then please suggest a good quality manufacturer that has a better cooling and noise solution than other 1900XTs. A price difference of 25-50 isn't big right now. Thanks!