Of course, making an inlet for the Model 3 that can do "all of the above" is the most customer-friendly solution. However, that doesn't mean that they'll do it.
My main reason for skepticism is the high level of integration of the charging system into the Model 3 battery pack. Many of the parts shown in the picture below were packaged under the back seat in the Model S or placed somewhere else in the car. The additional DC pins on the CCS Type-2 would require additional connections to the pack. You must have additional contactors for each HVDC contact. For example, when Supercharging through the Type-2 main pins, the CCS DC pins could be exposed, so they must be de-energized separately from the active wires used for SuperCharging.