Is your MBP solely dealt by iStore? Obviously they've done something inconvenient. I suggest you call Apple Asia and inform them of the problem and ordeals that you went through and ask for a case number for the repair or ask for a new replacement unit. These guys here have the authority to tell iStore to have your MBP replaced with a new one with just a call from them. As long as it is within bounds. Try insisting on asking for a new unit instead. I have some Apple advisor friends that says the same. Goodluck!