I think you've got it! I played for about 10 minutes with 40ms delay and no retriggers yet! I'll try to do more extensive testing when I have more time, but so far it's looking good. Let me know if you still need logs.
This may also have the added benefit of keeping my solenoids from frying. I use the A1U stock solenoids and they tend to crap out after triggering too often for extended periods of time. My brother did this to them yesterday on my machine. Had to wait like 15 minutes before they were usable again lol