Wholesale Pricing Heirarchy

We are having an issue with the heirarchy in the wholesale options. Our client registration plugin sets all new users to a base role of “customer” with the wholesale roles being placed in ‘other roles’.

So we end up with the wholesale accounts seeing the wholesale pricing because the base calculation from the customer role is overriding.

My retail customers have their own other role, so we dont need the base calculation. Is there a way to override this heirarchy?

Thank you for your assistance.