Yeah, that squealer(thats what we call it) touching the rotor should have been the first thing checked when it was in for the noise.

Do you go to the dealership? In Canada you are allowed to have your car serviced at an independent repair shop and still keep factory waranty. Usually we can save hundreds per visit on new car "maintance and inspections.