For the pump...can you feel it vibrating slightly, and are the pipes to and from it both hot? If not, and you can see a large screw in the pump centre, undo this (prepare for some water dribble) and you'll see another screw beneath which is the impeller for the pump. See if you can turn it. If the pump is running though, best to get someone in to change the diverter - it could just need the electric top changing, or maybe the whole thing.
John, October 2009