Update on this.
Had the car back from the garage and it was the opti which failed. It now has a new MSD vented opti, new MSD coil, new ignition module, new high flow water pump, 160 degrees thermostat, new spark plugs and new MSD plug wires. I have the 6AL in the garage and will install that...