Same strategy has worked for me; eliminate the grubs -> moles move on.
I spray my lawn with Imadacloprid which is generic Merit, Adonis etc. I get it from Amazon brand name Criterion 75WSP.
The stuff also works for lots of other pests. Fun fact: its very similar to nicotine.