I'll just use this thread to give an update, the PCB design is being finalized since I haven't finished the new case (almost done!). The layout will feature spacers along the F-row with support for the EXS layout. Same light indicators, same overall layout, Type C connector.
Here's the progress so far:
PCB, this is an old model the indicator lights have been added.
New kit, vendor requested gasket o-ring mount.