The heads are off, swap them or not..

How about head gaskets ?
I would start looking for the thinnest gasket available,to boost compression.