Before you go replacing bits, strip and clean everything. Check and clean your pads and discs, make sure the pistons are moving freely in the calipers, no marks on the piston surfaces, no splits in the seals, maybe fit new pistons and seals, renew the brake fluid, etc, etc. Also clean the slide pins right up and copper slip them.
Won't cost much and you might be surprised at the difference it could make.