I think you are right. Here is my proof.
\begin{align} E(Y|X) & = \sum_{y} y P(Y=y|X) \\\ & = \sum_{y} \sum_z y P(Y=y,Z=z|X) \\\ & = \sum_{y} \sum_z y P(Y=y| Z=z,X) P(Z) \\\ & = E_z \left[\sum_{y} y P(Y=y| Z=z,X) \right] \\\ & = E_z \left[E(Y|Z,X) \right] \end{align}