Partial characterizations of clique-perfect graphs ii: diamond-free and helly circular-arc graphs