I had the exact same thing, again, not necessarily a head gasket. I just finished a top end rebuilt, used cyclex gasket kit. So far no leaks and the kit had everything except a few o rings I had to hunt down on amazon. While I was in I measured everything I could. What my build ended up being was
New head gasket (kit)
New base gasket (kit)
Lapped valves
New rings
New o rings
New valve guides (kit)
New chain tensioner guide & wheel
Honed cylinders
Cleaned the piss out of every nook n cranny
Before going to all that length the first I'd recommend would be to do a compression test, and if that comes back sour do a leak test to see where loss is. After opening it up, just measure everything for tolerance (depending on what your tests conclude). Also I think cycleX is the only one with pucks in it... But I may be wrong.