IMO it's never worth waiting the next gen unless it's confirmed to be released less than 1-2 months away with strikingly significant upgrades.

After all's said and done (the expected delay, the initial shortage, waiting out the initial reviews, waiting out forum reviews, holding out for some promos, etc...) 6 months have probably passed, and the initial bugs will still be there.