@User I think you can make your design more ESD tolerant by changing the layout of the final. You can find inspiration by looking into the caravel gpio cell. Basically it means more distance for the contact to the poly gate and bulk/well tap on the source area.
Problem with relying on external ESD is that your chip may be destroyed by handling and assembly before it is put on the board.