I'd do the G60 if you can drill and tap without issue.
My fix was a thin bead of "The Right Stuff" on both sides of a new gasket. It really is fantastic stuff. Just be sure you're done taking the cover off for a while.
Zero leaks now - sweet.
I also had a leak at the hockey puck grommet (50° engine). I found a tighter grommet in my box of crap that sealed it.