Ok here's my latest attempt.

ATC Wiring update.pdf

I think Pin 6 is now the Thermal switch, so I've added this to the input. As you stated, once configured in UCCNC, this should trigger a stop, shouldn't it?