Should I replace an old breaker or add a new one?
I would definitely have the two circuit separated. In fact, they should have been from the start. 

If the water heater is a "standard" 4500 watt tank-type then a 20A breaker is not adequate anyway. You'd need #10 wire with a 30A two-pole breaker.