When I had water in a cyl & oil due to blown HGs back in Aug ‘16, what I did was run it, drain out water and change oil, repeat 4 times but made sure to drain water each time so it could not seep back into the motor oil.
I didn’t take the engine apart till the winter ‘16-‘17 but because I fogged...