Personally I would go down the option of refinishing your existing ones, if you buy some new OE replacements they will fail again eventually as they are not well prepped for the single coat of original finish
As a bonus you could match them to bodycolour or black at no extra cost