I would get a pair of the used OE ones with the circular ribs & clean em well & try them or as you said, rebuilt calipers (it'd be the easiest).

live every 24 hour block of time like it's your last day on earth