I think your setup on the old saph was far too complicated looking at the pictures. You only need 3 hoses in total, and 1 sandwich plate.

Remove the water modine and place in the garage / bin

Then fit sandwich plate to engine block, with the outlets facing upwards. It looks like you used Pirtek or a similar hose company for the hoses, get them to fit "compact" 90 degree fittings to the hose at the sandwich plate end, this will give you more space in that area.

Then you have one hose going from the sandwich plate to the remote oil filter block. Then one hose going from this to the oil cooler, then one hose going from the cooler back to the sandwich plate.

As for the water hoses, the shorter one is redundant, the longer one is used with some new hose goes straight onto the outlet at the back of the cylinder head.

This is how i have it on my car, but i haven't got any pics or my car here to take any pics