.....  Since it does fire in the solenoid test mode, does that pretty much rule out everything but the diodes on the coil?   

Check the diode and wires on the switch itself, not on the coil.  The coil already tested good, so leave it alone for now.

It's just the switch not registering properly.  Might just need adjustment or a clean as stated.

Did you remove the slingshot rubber when you tested the switch?