Might be my eyes, but I don't see any water diverters in there.
Maybe you pulled them out?
Hate to be a pest, but could you snap pics of both seperate sides of motor that includes all 3 holes with water passages?
Had a overheat problem on a motor kinda recently that turned out to be diverters, after I had replaced stats, poppets, grommets, pump and housing, water jacket gaskets, then finally head gaskets, where I found distorted diverters in the block passages.
Thank you, just curious.