I voted the first choice, but after reading a bit more, I think you're doing the right thing. It seems like the seller meant well and this was just an unfortunate problem (that could have been avoided easily, but was still a human mistake).
Good luck with all this mess! I'm sorry. =(