Many historians agree with you for the reasons you've mentioned. Others point to the Cárdenas years as the real end of the revolution because Calles still faced the Cristero revolt in the later 1920s and continued to shape the state through the Maximato.