I have to go with Satinsnow Dave on this one. As to the photo mixup, if you have listed multiple items on Ebay, you know that it is easy to mess up. If you tell it you are listing some items that have similarities to save your typing and clicking time, it 'remembers' things and you may forget to over-ride all of them.
You are getting all your money including postage both ways. What more can the guy do? He's given you everything you could possibly get under any scenario and yet you are the one who still seems dissatisfied. Just don't deal with him again.