Thanks guys, I'm just going over everything as I think perhaps the OP had done some "R.A.G" repairs....

I found a pic on marvin's with the wiring and I've matched it...Now if I manually open the EOS switch the flipper wont operate (ie pressing the button) so I hope this is right.  I wont play it until I get confirmation....

The ripper certainly kicks the ball out good!

Good news about the diode...I'm just paranoid about them now....I expect diodes on everything and I'm checking them all!