One point that you need to consider is that any neutral will have to service all 120v loads, regardless of which hot leg they're on, A or B.
I'm assuming the tank heater is 120v? Could try moving the breaker for it to an opposing leg and see what happens. Same with the solenoid (again, assuming...