[Ian21401]

I suggest that the hose to the water pump rigid pipe could be relatively straight if the rigid pipe to the water pump was shortened so that it terminated under the exhaust manifold instead of behind the block under the distributor.
Using an excessive length of hose to the block stub could possibly work if space could be found to to bend it without kinking and without fouling anything else.
Paul’s suggestion would be neater though. He and I are both familiar with successfully using 15mm copper pipe to join both the hoses to bypass the heater whilst having heater or HCV leakage problems.