have you thought about swapping the calipers with another brand?

if you are happy with the rest of the bike, this might be an easier option