While you are into a full brake refurbishment, if you still have the OEM brake lines, replace them .
Don't know what is available for you, but if you replace the lines, get braided stainless lines .
Take a good look at the surface of the pads that contact the rotor, chances are, they are shiny and glazed .
Put them on a piece of sandpaper, say 220 grit and rough them up a bit to remove the glazing, if any is present .