Good you have isolated the issue.
Just a note on cleaning the EOS (End Of Stroke) switches in this machine.
These are high current, tungsten based switch contacts and should be cleaned and dressed with a points file - just the same as an older car that uses ignition points. Using alcohol will do almost nothing to help with the cleaning of these. In fact, it could actually cause a fire due to the spark when these points operate.
Newer machines use silver or gold flashed contacts and these should NEVER be filed as that will destroy the contacts and the effectiveness of the contacts. Newer machines use the switches to tell the control PCB to switch the coils using transistors so the switches don't do the heavy lifting. These more modern types should be cleaned with a light card dampened with alcohol and drawn through the (held closed) contacts.
Hope that helps for the future.