If you live anywhere near an Apple Store, there's not a great incentive to wait. Everyone seems to have their pet story of that one time Apple didn't replace a thing they thought should be replaced, but generally the in-store employees will swap out a defective device without hassle.