Very good info, Jimmy. It sounds like a decent plan. I wonder if your engine guy will find an occlusion in the cam, which would explain the breakage.
Does the type 4 use a copper head gasket? Or does the head just interface directly with the cylinders? I always put some valve-grinding compound on the cylinders and hand-lap into the heads. No leaks yet.