One large aluminum tank would have to be shortened to "drop in".
With two tanks I would keep fuel valves the same. It's just a little more hose.
You can see what happed to your old neoprene adhered with self-stick adhesive. Fell off, moved around and trapped moisture between strips and tank...