I replaced the fuel heater in the filter head of my 1994 a couple of years ago. It was leaking at the fitting, and I thought as long as I was "going in", I might as well replace the whole thing and not just the orings, becuase I did not think it was working anyway. The one that I took out looked like your picture of the two piece heater. The one I installed looked like your picture of the one piece heater. If fit and works fine, and the best part is that is no longer leaks. The Ford part number on the heater is F2TZ-9J294-A and I think I bought mine from Dieselmann
http://www.intellidog.com/dieselmann/ford.htm I had one hell of a time loosening up the threaded brass stem (that the filter screws onto) that the heater plate is held captive under. If you have the brass stem out, then the hard part is over. Remember to lubricate your orings when installing them on the new heater and you should be good to go.