The water-block is genius, so how about taking advantage of the length of the battery tube for cooling the water temperature ?
Something like a battery tube with milled fins on the whole length and the water pipe going through the fins. Sorry for the 4 years old kid drawing :person_facepalming: