The problem of adding water at the wrong times is likely a bad
load sense switch. This is a high failure item on this washer, but that should have nothing to do with your other problem. If you put the timer at drain/spin and it agitates instead, that would be a timer problem.
Eric