Don't know what tank would cross-fit, but I always recommend Spectra-Premium gas tanks or radiators. In my experience (40 or so years in the car parts business), they make the best. Some are Canadian, some are made in USA. They have a website and may be able to match based on your measurements, they may even be open to manufacturing new tanks.