The coronavirus crisis must cause us to rethink the idea governments can manage these situations. It is absolutely true that most private industry can be trusted, because the alternative for poor or unscrupulous providers is failure.
Whether diversity is a social benefit depends on whether it creates excuses to fight each other for special treatment. Politicizing our differences is far more likely to make diversity a source of conflict.
Clearly marked prices on private-sector cash-payment surgeries are a great thing. In fact, the competition of for-profit surgery centers drives down prices at more "traditional" (i.e., highly bureaucratized) hospitals.