I am thinking of getting two GTX 480s as an upgrade from my single GTX 285. Should I go and buy them or wait for new cards?

Also it will be on air. Probably on water in 2-3 months.