I like how you think: Get in there and replace both relays - costs little and saves a lot of time.

Unfortunately, I've owned three roadsters over nine years and have never got into the top pump/controller. I know they are what looks like auto-industry-standard 30 amp Single-Pole, Single-Throw relays, so these should work, but I can't say for sure:

https://www.mouser.com/ProductDetail...iABEgKAWfD_BwE

The industry uses pretty standard stuff, in fact, the relays on the RCM cost me $2.38 each plus shipping - they are widely used relays. I suspect the relays in the Top Module are just standard 30 amp auto relays as depicted above. You can get them for around $9 each at Autozone, etc. - but I think Mouser's are higher quality - tho I may be wrong.