Either way, you're gonna hafta pull the head to fix it.
If its the HG, you'll see the water stains on the sealing surface.
Make sure you have the head checked for warpage, and pressure tested.
You'll need HG set, timing belt, and should replace the water pump while you have access to it.
John C.