Heli coil is the way to go.... Had a 4 cyl F*&d few years back to put an engine in at work... New head had 7 or 8 helicoils never came back no water leaks or nonething ...kid dirving it was about 19 at the time.
Just FOLLOW instructions to the letter.
Brad