+1 for the shims.

I've had a similar situation with my W126 after I replaced a brake calliper. It was very squeaky during light braking until I added the missing shim under the brake pad.