How about using the diamante heads with the original cams? I think the diff in the diamante is the pistons, not the combustion chamber size. I also advise against the shims. You lose the squish area in the chamber which promotes detonation.

Not responsible for advice not taken...