kerrbe-
You'll have to do some plumbing to fit a different valve. Instead of putting a new three-way valve in the system, you should replace it with three individual valves as shown on
this Web page. With three individual valves you can also remove the check valve that is on the hot water outlet of the heater. This check valve fails and causes problems.