Maybe look into a Clevo machine. For example, the Clevo P775 has 2xM2 2x2.5" slots, similar connectors (missing sim card) and supports up to 64GB of RAM (4 slots). There are other options as well.