The tenders are all a little different, ranging from about 19K gal to about 23K gal. The Atlas car, at about 21K gal kinda straddles the line between them all, so it'd be a good fit if you were happy with a foobie, which I would be.
I suppose if you really wanted to, you could cut a couple scale feet out of one and add it to another, to get both a longer car and a shorter car.