I need a new tank and will be in the same predicament.
If you get a "spectra" brand tank you won't have to worry about metric threads. They have the correct pipe thread at the bottom
rockauto.com seems to have the best price
tanks-to-pans may also carry the spectra tank
