Currently the RMA support is for like to like PID of device for complete config copied to other device.
In principle your suggestion of "removing one of the pair, provision the new CP/BD then repeat for the other CP/BD" is ok. But there can be different config on your device depends on the border/cp connectivity in the network, recommendation is to open TAC case for getting support of this replacement and minimize downtime.