Update to BB; after a few emails they said I didn't even have to return the mistake one and they'll ship the new BB with my Dragonstorm... so assuming that happens we should be all good!