The solution is spelled out as either or. That does not properly address the reality.
I believe the shake out will be both diesel and CNG. It will be an evolutionary process.
The long haul interstate freight lines will migrate towards CNG. The independents and company owned vehicles will remain diesel.
I would add LNG. Fleet service and long haul are sometimes going to be more economic on LNG.