Not trying to pimp here. , but
formatting link
offers 100's of sizes of replacement tanks for water and waste. Plastic-mart let's you located the fittings , any size , any location....
custom sizes are available as well just by asking.... call toll free
866 310 2556 anytime...