Don't wait, just get the SGS2. Yes, tomorrow will bring a new phone, but that's never going to change.
I waited last year for the SGS2 when it was announced in March... I finally got a phone in October... Had I known it was going to take ATT that long I would have just gotten something else.