I finished the design of Rev4 (and Rev3 in between) of my USB-C PD Sink. Most important improvements are a 2nd switch to select the current and new switching FETs . The new FETs have a Rds_on of only 9.5 mOhm (at Vsg = 4.5V), which cuts the dissipation almost in half and keeps the board cooler, even with 5 A current draw.
And I did a measurement with 24 boards, which showed the real Rds_on to be 7.1mOhm on average, because the Vsg is ~15V at the 20V setting. Also the calculated junction temperature is quite low and much more manageable now.
And then I found an even better FETs that has a Rds_on of only 9.5 mOhm (at Vsg = 10V), which is just as good as the previous one as Vsg >10 V at the output setting of 12V or more.
This FET is the Diodes DMP3013SFV. same 3.3mm x 3.3mm footprint.
Again I did a measurement with 19 boards, which showed to real Rds_on to be 7.3 mOhm on average, because the Vsg is ~15V at the 20V setting.