Removed the code for the extra E-stop as the code was getting hung up (the physical button was absent on my build).  Now to stop, simply press both buttons twice.