i feel ya pain. i tried everything, but still ended up with rusty water. was annoying seeing as i had just bought a new header tank, did a full coolant flush, and it still did nothing and fukt my new header tank within a day.
when changing my engine further down the line, i saw it was the inside water paths in the block that were orange with rust. so couldnt really be helped