There are two kinds of polyethylene--linear and crosslinked. Linear PE is either low density or high density. Water and waste tanks are low density linear polyethylene (LDPE). Very little HDPE is used for tankage in the marine industry.
Fuel tanks cannot be made of high OR low density linear ...because linear PE will permeate low density or high...in fact, can even "melt" it. So plastic fuel tanks must be made of CROSSLINKED polyethylene.
I wouldn't recommend going with another Todd tank...90% of the "off the shelf" rectangular water and waste tanks in the marine catalogs are Todd.... they're cheap, because they're thin and low quality--too thin to support the weight of the contents....so unless a Todd tank is supported on all sides, it will flex and bulge which will cause it to crack. A good quality thickwalled tank will last as long as the boat unless it's abused.
Your best source for a new water tank is Ronco Plastics
Ronco Plastics Marine Catalog (no relation to the VegoMatic Ronco). They make TOP quality thick walled (at least 3/8") water and waste tanks for a very reasonable price--that's even more reasonable if you order it through the online store at this site--and have more than 400 shapes/sizes, over 100 of which are non-rectangular. And they install fittings in the sizes and locations specified by the customer when they make the tank. So you can prob'ly find an even larger tank to fit your space than you have now.