Water in oil after rebuild - looking for guidance

That sounds like you found your problem. It takes a while to work out all the mayo in valve covers. I know your head gaskets are more than likely one and done for torque but did you retorque the intake?