Hot water tank cold water is always flowing
I'd try replacing the relief value that is screwed into the shut off valve to see if it solves the water flow issue. Sometimes once they are activated, they don't like to stop for varous reasons. 

As for the expansion tank, it should be installed before the water heater. They are normally installed near where the water comes into the building.