I don’t think Cruz will leave the race until Cleveland. Cruz is in the race out of spite and hatred towards Trump. Cruz will attempt to steal it at Cleveland
Sadly, I think you are right. Tis a shame.