Sounds like you're close Adam .
I'm starting to lose count of how many EM pins I've had now
, (I think its 12 ?) but have to agree I've found that the systematic approach works best (ie a full mechanical overhaul) .
Even the youngest of these games is turning 37 this year and most you will come across have not been serviced in a long long time , if ever.
Plus, once they are running they need to be played regularly or gemlins will resurface .