Once you get the CCU working, and you may have to replace it with a rebuilt unit, you can safely remove or bypass the aux water pump. It is only to provide heat quickly at low speeds and as you know by now can be a source of expensive problems.

Some have placed an in-line fuse on the power side to the pump to protect it but I removed and bypassed mine about three years ago and don't notice any difference in CC operation.