I ordered a new plasma cutter today, rather than mess about with my little 30A drag torch, I rang my supplier and fixed a good part exchange package on a 50A pilot arc model with machine torch.

hopefully that will ensure that at least the torch is up to the job, it also has CNC connections.