Hi
I just replaced the water heater on my 1982 323. The cylinder shape water heater that I took out was a 6 gallon Raritan , model 170611, with heat exchanger, The measurements were very close to yours. Check out their website for exact specifications. It was NOT cheap but it worked in the space allocated without a lot of extra modifications
Steve