I'd feel comfortable still as long as you're retaking in early August. If you submit in the next few days, you probably won't be verified for sending for at least a week, probably two. That puts you close to August. You destroy the test early August, wait a couple weeks or so for that to clear, and you're good to go. A complete app by end of August/early September is not late (unless you've got like a 3.0 and a 18AA or something). I'd say a good portion of schools are just starting to go through apps in August. So you're looking at a window of a few weeks where a school could potentially look at old scores. Note, I'm under the impression that most schools will honor the future exam date and wait for updated scores. It's just a handful who won't wait and process any complete apps, even with a future date on there. You may even consider faxing unofficial scores to schools if they will accept them so that potential window is even smaller and so your app will be complete a couple of weeks sooner.
Don't sweat it. Worry about pulling off a monster score and then try the fax route. Good luck!