Don't upgrade, caliper can't be too much on Ebay. My dealer says the pads are the same but I'll bet Moe's correct. The only reason I wonder is because front calipers are a dime a dozen.
Still, I'll bet pistons and seals and a new set of pads will solve your issue.
