I think you called the right decision to stop it here. All this mess will be fixed in an eye blinking with mass shape selection.
