I agree with everything except this statement.
"I should have completely drained the coolant from the block"
Please explain why?
I think You could cause more issues having the cooling system completely exposed.
I could see draining the cooling system and refilling with fresh.